bk commit into 5.0 tree (gkodinov:1.2521) BUG#29325

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-06 18:57:51+03:00, gkodinov@stripped +9 -0
  Bug #29325: 
  By default MyISAM overwrites .MYD and .MYI files no 
  DATA DIRECTORY option is used. This can lead to two tables
  using the same .MYD and .MYI files (that can't be dropped).
  
  To prevent CREATE TABLE from overwriting a file a new option
  is introduced : 
  dont_overwrite_files_if_data_directory_is_current_database
  When this is on the CREATE TABLE throws an error if either
  the .MYD or .MYI exists for a MyISAM table.
  The option is off by default (resulting in compatible behavior).

  include/my_base.h@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +1 -0
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

  myisam/mi_create.c@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +4 -2
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

  mysql-test/r/create.result@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +19 -0
    Bug #29325: test case

  mysql-test/t/create.test@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +29 -0
    Bug #29325: test case

  sql/ha_myisam.cc@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +2 -0
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

  sql/set_var.cc@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +11 -0
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

  sql/sql_class.h@stripped, 2007-07-06 18:57:49+03:00, gkodinov@stripped +1 -0
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

  sql/sql_table.cc@stripped, 2007-07-06 18:57:50+03:00, gkodinov@stripped +2 -0
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

  sql/unireg.cc@stripped, 2007-07-06 18:57:50+03:00, gkodinov@stripped +2 -0
    Bug #29325: introduce 
    dont_overwrite_files_if_data_directory_is_current_database

diff -Nrup a/include/my_base.h b/include/my_base.h
--- a/include/my_base.h	2007-04-05 09:29:08 +03:00
+++ b/include/my_base.h	2007-07-06 18:57:49 +03:00
@@ -279,6 +279,7 @@ enum ha_base_keytype {
 #define HA_PACK_RECORD		2	/* Request packed record format */
 #define HA_CREATE_TMP_TABLE	4
 #define HA_CREATE_CHECKSUM	8
+#define HA_CREATE_KEEP_FILES	16      /* don't overwrite .MYD and MYI */
 #define HA_CREATE_DELAY_KEY_WRITE 64
 
 /*
diff -Nrup a/myisam/mi_create.c b/myisam/mi_create.c
--- a/myisam/mi_create.c	2007-03-13 16:05:10 +02:00
+++ b/myisam/mi_create.c	2007-07-06 18:57:49 +03:00
@@ -586,7 +586,8 @@ int mi_create(const char *name,uint keys
 					     32 : 0));
     linkname_ptr=0;
     /* Replace the current file */
-    create_flag=MY_DELETE_OLD;
+    if (!(flags & HA_CREATE_KEEP_FILES))
+      create_flag=MY_DELETE_OLD;
   }
 
   /*
@@ -647,7 +648,8 @@ int mi_create(const char *name,uint keys
       {
 	fn_format(filename,name,"",MI_NAME_DEXT,4);
 	linkname_ptr=0;
-	create_flag=MY_DELETE_OLD;
+        if (!(flags & HA_CREATE_KEEP_FILES))
+          create_flag=MY_DELETE_OLD;
       }
       if ((dfile=
 	   my_create_with_symlink(linkname_ptr, filename, 0, create_mode,
diff -Nrup a/mysql-test/r/create.result b/mysql-test/r/create.result
--- a/mysql-test/r/create.result	2007-06-27 14:35:48 +03:00
+++ b/mysql-test/r/create.result	2007-07-06 18:57:49 +03:00
@@ -1503,4 +1503,23 @@ t1	CREATE TABLE `t1` (
   `c17` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+USE db2;
+CREATE TABLE t1 (b INT) ENGINE MYISAM
+DATA DIRECTORY =
'/home/kgeorge/mysql/work/B29325-5.0-opt/mysql-test/var/master-data/db1/';
+INSERT INTO db2.t1 VALUES (1);
+SELECT * FROM db2.t1;
+b
+1
+RESET QUERY CACHE;
+USE db1;
+SET SESSION dont_overwrite_files_if_data_directory_is_current_database = TRUE;
+CREATE TABLE t1 (a INT) ENGINE MYISAM;
+ERROR HY000: Can't create/write to file './db1/t1.MYD' (Errcode: 17)
+SET SESSION dont_overwrite_files_if_data_directory_is_current_database = DEFAULT;
+DROP TABLE db2.t1;
+DROP DATABASE db1;
+DROP DATABASE db2;
+USE test;
 End of 5.0 tests
diff -Nrup a/mysql-test/t/create.test b/mysql-test/t/create.test
--- a/mysql-test/t/create.test	2007-06-27 14:35:48 +03:00
+++ b/mysql-test/t/create.test	2007-07-06 18:57:49 +03:00
@@ -1118,5 +1118,34 @@ show create table t1;
 
 drop table t1;
 
+#
+# Bug #29325: create table overwrites .MYD file of other table (datadir)
+#
+
+CREATE DATABASE db1; 
+CREATE DATABASE db2;
+
+USE db2;
+eval CREATE TABLE t1 (b INT) ENGINE MYISAM
+DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/db1/';
+
+INSERT INTO db2.t1 VALUES (1);
+SELECT * FROM db2.t1;
+RESET QUERY CACHE;
+
+USE db1;
+
+#no warning from create table
+SET SESSION dont_overwrite_files_if_data_directory_is_current_database = TRUE;
+--disable_abort_on_error
+CREATE TABLE t1 (a INT) ENGINE MYISAM;
+--enable_abort_on_error
+SET SESSION dont_overwrite_files_if_data_directory_is_current_database = DEFAULT;
+
+DROP TABLE db2.t1;
+DROP DATABASE db1;
+DROP DATABASE db2;
+USE test;
+
 
 --echo End of 5.0 tests
diff -Nrup a/sql/ha_myisam.cc b/sql/ha_myisam.cc
--- a/sql/ha_myisam.cc	2007-06-06 02:42:39 +03:00
+++ b/sql/ha_myisam.cc	2007-07-06 18:57:49 +03:00
@@ -1809,6 +1809,8 @@ int ha_myisam::create(const char *name, 
 
   if (ha_create_info->options & HA_LEX_CREATE_TMP_TABLE)
     create_flags|= HA_CREATE_TMP_TABLE;
+  if (ha_create_info->options & HA_CREATE_KEEP_FILES)
+    create_flags|= HA_CREATE_KEEP_FILES;
   if (options & HA_OPTION_PACK_RECORD)
     create_flags|= HA_PACK_RECORD;
   if (options & HA_OPTION_CHECKSUM)
diff -Nrup a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc	2007-06-06 00:04:33 +03:00
+++ b/sql/set_var.cc	2007-07-06 18:57:49 +03:00
@@ -592,6 +592,12 @@ sys_var_const_str		sys_license("license"
 /* Global read-only variable containing hostname */
 sys_var_const_str		sys_hostname("hostname", glob_hostname);
 
+sys_var_thd_bool 
+ sys_dont_overwrite_files_if_data_directory_is_current_database
+ ("dont_overwrite_files_if_data_directory_is_current_database", 
+  &SV::dont_overwrite_files_if_data_directory_is_current_database);
+							    
+
 
 
 /*
@@ -637,6 +643,7 @@ sys_var *sys_variables[]=
   &sys_delayed_insert_limit,
   &sys_delayed_insert_timeout,
   &sys_delayed_queue_size,
+  &sys_dont_overwrite_files_if_data_directory_is_current_database,
   &sys_error_count,
   &sys_expire_logs_days,
   &sys_flush,
@@ -849,6 +856,10 @@ struct show_var_st init_vars[]= {
   {sys_delayed_insert_timeout.name, (char*) &sys_delayed_insert_timeout, SHOW_SYS},
   {sys_delayed_queue_size.name,(char*) &sys_delayed_queue_size,     SHOW_SYS},
   {sys_div_precincrement.name,(char*) &sys_div_precincrement,SHOW_SYS},
+  {sys_dont_overwrite_files_if_data_directory_is_current_database.name,
+    (char*) &sys_dont_overwrite_files_if_data_directory_is_current_database,
+                                                                    SHOW_SYS},
+
   {sys_engine_condition_pushdown.name,
    (char*) &sys_engine_condition_pushdown,                          SHOW_SYS},
   {sys_expire_logs_days.name, (char*) &sys_expire_logs_days,        SHOW_SYS},
diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h	2007-07-06 01:42:56 +03:00
+++ b/sql/sql_class.h	2007-07-06 18:57:49 +03:00
@@ -566,6 +566,7 @@ struct system_variables
   my_bool new_mode;
   my_bool query_cache_wlock_invalidate;
   my_bool engine_condition_pushdown;
+  my_bool dont_overwrite_files_if_data_directory_is_current_database;
 
 #ifdef HAVE_INNOBASE_DB
   my_bool innodb_table_locks;
diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc
--- a/sql/sql_table.cc	2007-06-15 18:46:58 +03:00
+++ b/sql/sql_table.cc	2007-07-06 18:57:50 +03:00
@@ -2841,6 +2841,8 @@ bool mysql_create_like_table(THD* thd, T
     and temporary tables).
   */
   *fn_ext(dst_path)= 0;
+  if (thd->variables.dont_overwrite_files_if_data_directory_is_current_database)
+    create_info->options|= HA_CREATE_KEEP_FILES;
   err= ha_create_table(dst_path, create_info, 1);
 
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
diff -Nrup a/sql/unireg.cc b/sql/unireg.cc
--- a/sql/unireg.cc	2007-05-16 11:44:43 +03:00
+++ b/sql/unireg.cc	2007-07-06 18:57:50 +03:00
@@ -285,6 +285,8 @@ int rea_create_table(THD *thd, my_string
   if (mysql_create_frm(thd, file_name, db, table, create_info,
                        create_fields, keys, key_info, NULL))
     DBUG_RETURN(1);
+  if (thd->variables.dont_overwrite_files_if_data_directory_is_current_database)
+    create_info->options|= HA_CREATE_KEEP_FILES;
   if (!create_info->frm_only && ha_create_table(file_name,create_info,0))
   {
     my_delete(file_name,MYF(0));