MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:ahristov Date:November 22 2006 3:12pm
Subject:bk commit into 5.1 tree (andrey:1.2394)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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, 2006-11-22 16:12:15+01:00, andrey@stripped +4 -0
  Merge ahristov@stripped:/home/bk/mysql-5.1-maint
  into  example.com:/work/bug22369/my51
  MERGE: 1.2303.39.1

  mysql-test/r/alter_table.result@stripped, 2006-11-22 16:06:09+01:00, andrey@stripped +0 -0
    Auto merged
    MERGE: 1.66.1.1

  mysql-test/t/alter_table.test@stripped, 2006-11-22 16:06:09+01:00, andrey@stripped +0 -0
    Auto merged
    MERGE: 1.51.1.1

  sql/mysql_priv.h@stripped, 2006-11-22 16:06:09+01:00, andrey@stripped +0 -0
    Auto merged
    MERGE: 1.451.1.1

  sql/sql_table.cc@stripped, 2006-11-22 16:06:10+01:00, andrey@stripped +0 -0
    Auto merged
    MERGE: 1.370.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	example.com
# Root:	/work/bug22369/my51/RESYNC

--- 1.454/sql/mysql_priv.h	2006-11-22 16:12:27 +01:00
+++ 1.455/sql/mysql_priv.h	2006-11-22 16:12:27 +01:00
@@ -1828,9 +1828,10 @@ uint tablename_to_filename(const char *f
 uint build_table_filename(char *buff, size_t bufflen, const char *db,
                           const char *table, const char *ext, uint flags);
 /* Flags for conversion functions. */
-#define FN_FROM_IS_TMP  (1 << 0)
-#define FN_TO_IS_TMP    (1 << 1)
-#define FN_IS_TMP       (FN_FROM_IS_TMP | FN_TO_IS_TMP)
+#define FN_FROM_IS_TMP   (1 << 0)
+#define FN_TO_IS_TMP     (1 << 1)
+#define FN_IS_TMP        (FN_FROM_IS_TMP | FN_TO_IS_TMP)
+#define FN_NO_FRM_RENAME (1 << 2)
 
 /* from hostname.cc */
 struct in_addr;

--- 1.374/sql/sql_table.cc	2006-11-22 16:12:27 +01:00
+++ 1.375/sql/sql_table.cc	2006-11-22 16:12:27 +01:00
@@ -3654,8 +3654,8 @@ make_unique_key_name(const char *field_n
                                 FN_TO_IS_TMP   new_name is temporary.
 
   RETURN
-    0           OK
-    != 0        Error
+    FALSE   OK
+    TRUE    Error
 */
 
 bool
@@ -3704,7 +3704,7 @@ mysql_rename_table(handlerton *base, con
 
   if (!file || !(error=file->rename_table(from_base, to_base)))
   {
-    if (rename_file_ext(from,to,reg_ext))
+    if (!(flags & FN_NO_FRM_RENAME) && rename_file_ext(from,to,reg_ext))
     {
       error=my_errno;
       /* Restore old file name */
@@ -5196,7 +5196,57 @@ static uint compare_tables(TABLE *table,
 
 
 /*
-  Alter table
+  SYNOPSIS
+    mysql_alter_table()
+      thd              Thread handler
+      new_db           If there is a RENAME clause
+      new_name         If there is a RENAME clause
+      lex_create_info  Information from the parsing phase. Since some
+                       clauses are common to CREATE and ALTER TABLE, the
+                       data is stored in lex->create_info. The non-common
+                       is stored in lex->alter_info.
+      table_list       The table to change.
+      fields           lex->create_list - List of fields to be changed,
+                       added or dropped.
+      keys             lex->key_list - List of keys to be changed, added or
+                       dropped.
+      order_num        How many ORDER BY fields has been specified.
+      order            List of fields to ORDER BY.
+      ignore           Whether we have ALTER IGNORE TABLE
+      alter_info       Information from the parsing phase specific to ALTER
+                       TABLE and not shared with CREATE TABLE.
+      do_send_ok       Whether to call send_ok() on success.
+
+  DESCRIPTION
+    This is a veery long function and is everything but the kitchen sink :)
+    It is used to alter a table and not only by ALTER TABLE but also
+    CREATE|DROP INDEX are mapped on this function, as well as RENAME TABLE.
+    When the ALTER TABLE statement just does a RENAME (or it is a
+    RENAME TABLE) or ENABLE|DISABLE KEYS, then this function short cuts its
+    operation by renaming the table and/or enabling/disabling the keys.
+    In this case the FRM is not changed. However, if there is a RENAME +
+    change of a field, or an index the short cut is not used.
+    `fields` is used to generate the new FRM regarding the structure of the
+    fields. The same is done for the indices of the table.
+
+    Important is the fact that this function tries to do as less work as
+    possible by finding out whether a temporary table is needed to copy data
+    into and when finishing the altering to use it as the original table.
+    For this reason the function compare_tables() is called, which decides
+    based on all kind of data how similar are the new and the original
+    tables. 
+
+  NOTES
+    Combined ALTER TABLE that does change the name of the table as well,
+    as fields and indices could be slower than when broken down in two
+    statements one of which renames the table and the other changes its
+    structure. The reason is because in the former case the data is
+    copied and then changed. OTOH, if the tables are `compatible` then
+    the two statements won't do any copy but combined ALTER TABLE will.
+
+  RETURN VALUES
+    FALSE  OK
+    TRUE   Error
 */
 
 bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
@@ -5215,7 +5265,7 @@ bool mysql_alter_table(THD *thd,char *ne
   char reg_path[FN_REFLEN+1];
   ha_rows copied,deleted;
   uint db_create_options, used_fields;
-  handlerton *old_db_type, *new_db_type;
+  handlerton *old_db_type, *new_db_type, *save_old_db_type;
   legacy_db_type table_type;
   HA_CREATE_INFO *create_info;
   frm_type_enum frm_type;
@@ -5236,6 +5286,7 @@ bool mysql_alter_table(THD *thd,char *ne
   uint index_add_count;
   uint *index_add_buffer;
   bool committed= 0;
+  bool indexes_were_disabled;
   DBUG_ENTER("mysql_alter_table");
 
   LINT_INIT(index_add_count);
@@ -5519,7 +5570,9 @@ view_err:
     DBUG_RETURN(error);
   }
 
-  /* Full alter table */
+  /* Ok. We have to do full alter table */
+
+  indexes_were_disabled= table->file->indexes_are_disabled();
 
   /* Let new create options override the old ones */
   if (!(used_fields & HA_CREATE_USED_MIN_ROWS))
@@ -6360,6 +6413,8 @@ view_err:
 
 
   error=0;
+  save_old_db_type= old_db_type;
+  
   if (!need_copy_table)
     new_db_type=old_db_type= NULL; // this type cannot happen in regular ALTER
   if (mysql_rename_table(old_db_type, db, table_name, db, old_name,
@@ -6381,6 +6436,15 @@ view_err:
     VOID(mysql_rename_table(old_db_type, db, old_name, db, alias,
                             FN_FROM_IS_TMP));
   }
+  else if (!need_copy_table &&
+           mysql_rename_table(save_old_db_type, db, table_name, new_db,
+                              new_alias, FN_NO_FRM_RENAME))
+  {
+    /* Revert */
+    mysql_rename_table(old_db_type, db, old_name, db, alias, FN_FROM_IS_TMP);
+    error= 1;
+  }
+
   if (error)
   {
     /*
@@ -6412,6 +6476,7 @@ view_err:
       goto err;
     }
   }
+
   if (thd->lock || new_name != table_name || no_table_reopen)  // True if WIN32
   {
     /*
@@ -6478,10 +6543,7 @@ view_err:
   DBUG_ASSERT(!(mysql_bin_log.is_open() && thd->current_stmt_binlog_row_based &&
                 (create_info->options & HA_LEX_CREATE_TMP_TABLE)));
   write_bin_log(thd, TRUE, thd->query, thd->query_length);
-  /*
-    TODO RONM: This problem needs to handled for Berkeley DB partitions
-    as well
-  */
+
   if (ha_check_storage_engine_flag(old_db_type,HTON_FLUSH_AFTER_RENAME))
   {
     /*

--- 1.67/mysql-test/r/alter_table.result	2006-11-22 16:12:27 +01:00
+++ 1.68/mysql-test/r/alter_table.result	2006-11-22 16:12:27 +01:00
@@ -733,3 +733,33 @@ Table	Create Table
   `c1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE `#sql2`, `@0023sql1`;
+DROP TABLE IF EXISTS bug_22369;
+DROP TABLE IF EXISTS fibonacci;
+CREATE TABLE bug_22369 (
+int_field int UNSIGNED NOT NULL,
+char_field CHAR(1),
+INDEX(`int_field`)
+);
+DESCRIBE bug_22369;
+Field	Type	Null	Key	Default	Extra
+int_field	int(10) unsigned	NO	MUL		
+char_field	char(1)	YES		NULL	
+SHOW INDEXES FROM bug_22369;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+bug_22369	1	int_field	1	int_field	A	NULL	NULL	NULL		BTREE	
+"Non-copy data change - new frm, but old data and index files"
+ALTER TABLE bug_22369
+CHANGE int_field unsigned_int_field int unsigned not null,
+RENAME fibonacci;
+SELECT * FROM bug_22369 ORDER BY int_field;
+ERROR 42S02: Table 'test.bug_22369' doesn't exist
+DESCRIBE fibonacci;
+Field	Type	Null	Key	Default	Extra
+unsigned_int_field	int(10) unsigned	NO	MUL		
+char_field	char(1)	YES		NULL	
+ALTER TABLE fibonacci MODIFY unsigned_int_field bigint unsigned not null;
+DESCRIBE fibonacci;
+Field	Type	Null	Key	Default	Extra
+unsigned_int_field	bigint(20) unsigned	NO	MUL		
+char_field	char(1)	YES		NULL	
+DROP TABLE fibonacci;

--- 1.52/mysql-test/t/alter_table.test	2006-11-22 16:12:27 +01:00
+++ 1.53/mysql-test/t/alter_table.test	2006-11-22 16:12:27 +01:00
@@ -101,7 +101,7 @@ create table mysqltest.t1 (name char(15)
 insert into mysqltest.t1 (name) values ("mysqltest");
 select * from t1;
 select * from mysqltest.t1;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 alter table t1 rename mysqltest.t1;
 select * from t1;
 select * from mysqltest.t1;
@@ -231,9 +231,9 @@ DROP TABLE t1;
 # BUG#4717 - check for valid table names
 #
 create table t1 (a int);
---error 1103
+--error ER_WRONG_TABLE_NAME
 alter table t1 rename to ``;
---error 1103
+--error ER_WRONG_TABLE_NAME
 rename table t1 to ``;
 drop table t1;
 
@@ -325,14 +325,14 @@ drop table t1;
 CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);
 ALTER TABLE t1 DROP PRIMARY KEY;
 SHOW CREATE TABLE t1;
---error 1091
+--error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t1 DROP PRIMARY KEY;
 DROP TABLE t1;
 
 # BUG#3899
 create table t1 (a int, b int, key(a));
 insert into t1 values (1,1), (2,2);
---error 1091
+--error ER_CANT_DROP_FIELD_OR_KEY
 alter table t1 drop key no_such_key;
 alter table t1 drop key a;
 drop table t1;
@@ -343,7 +343,7 @@ drop table t1;
 # Some platforms (Mac OS X, Windows) will send the error message using small letters.
 CREATE TABLE T12207(a int) ENGINE=MYISAM;
 --replace_result t12207 T12207
---error 1031
+--error ER_ILLEGAL_HA
 ALTER TABLE T12207 DISCARD TABLESPACE;
 DROP TABLE T12207;
 
@@ -367,7 +367,7 @@ drop table t1;
 # shorter than packed field length.
 #
 create table t1 ( a timestamp );
---error 1089
+--error ER_WRONG_SUB_KEY
 alter table t1 add unique ( a(1) );
 drop table t1;
 
@@ -380,7 +380,7 @@ create table t1 (c1 int);
 # Move table to other database.
 alter table t1 rename mysqltest.t1;
 # Assure that it has moved.
---error 1051
+--error ER_BAD_TABLE_ERROR
 drop table t1;
 # Move table back.
 alter table mysqltest.t1 rename t1;
@@ -394,7 +394,7 @@ use mysqltest;
 # Drop the current db. This de-selects any db.
 drop database mysqltest;
 # Now test for correct message.
---error 1046
+--error ER_NO_DB_ERROR
 alter table test.t1 rename t1;
 # Check that explicit qualifying works even with no selected db.
 alter table test.t1 rename test.t1;
@@ -554,3 +554,35 @@ SHOW CREATE TABLE `#sql2`;
 SHOW CREATE TABLE `@0023sql1`;
 DROP TABLE `#sql2`, `@0023sql1`;
 
+#
+# Bug #22369: Alter table rename combined with other alterations causes lost tables
+#
+# This problem happens if the data change is compatible.
+# Changing to the same type is compatible for example.
+#
+--disable_warnings
+DROP TABLE IF EXISTS bug_22369;
+DROP TABLE IF EXISTS fibonacci;
+--enable_warnings
+CREATE TABLE bug_22369 (
+  int_field int UNSIGNED NOT NULL,
+  char_field CHAR(1),
+  INDEX(`int_field`)
+);
+
+DESCRIBE bug_22369;
+
+SHOW INDEXES FROM bug_22369;
+
+--echo "Non-copy data change - new frm, but old data and index files"
+ALTER TABLE bug_22369
+  CHANGE int_field unsigned_int_field int unsigned not null,
+  RENAME fibonacci;
+
+--error ER_NO_SUCH_TABLE
+SELECT * FROM bug_22369 ORDER BY int_field;
+DESCRIBE fibonacci;
+ALTER TABLE fibonacci MODIFY unsigned_int_field bigint unsigned not null;
+DESCRIBE fibonacci;
+
+DROP TABLE fibonacci;
Thread
bk commit into 5.1 tree (andrey:1.2394)ahristov22 Nov