bk commit into 5.0 tree (ramil:1.2504) BUG#28652

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-06-01 22:53:50+05:00, ramil@stripped +3 -0
  Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
  
  Problem: we may create a deadlock committing changes in the mysql_alter_table() when 
  LOCK_open is set. Moreover, "in some variants of the ALTER TABLE commit
  happens earlier, outside of LOCK_open, in other later - inside. It's no good, a storage 
  engine code that is called in between could expect a consistency - either there is a 
  transaction or there is not".
  Fix: move the commit to happen earlier and outside of the LOCK_open.

  mysql-test/r/innodb_mysql.result@stripped, 2007-06-01 22:53:49+05:00, ramil@stripped +8 -0
    Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
      - test result.

  mysql-test/t/innodb_mysql.test@stripped, 2007-06-01 22:53:49+05:00, ramil@stripped +8 -0
    Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
      - test case.

  sql/sql_table.cc@stripped, 2007-06-01 22:53:49+05:00, ramil@stripped +9 -12
    Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
      - commit moved to happen earlier in the mysql_alter_table(), 
        now we commit changes at the same time as in case when a temporary 
        table is used.

# 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:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b28652/b28652.5.0

--- 1.343/sql/sql_table.cc	2007-06-01 22:53:54 +05:00
+++ 1.344/sql/sql_table.cc	2007-06-01 22:53:54 +05:00
@@ -3776,6 +3776,9 @@ view_err:
                             alter_info->keys_onoff);
     table->file->external_lock(thd, F_UNLCK);
     VOID(pthread_mutex_unlock(&LOCK_open));
+    error= ha_commit_stmt(thd);
+    if (ha_commit(thd))
+      error= 1;
   }
 
   thd->last_insert_id=next_insert_id;		// Needed for correct log
@@ -3946,16 +3949,6 @@ view_err:
       goto err;
     }
   }
-  /* The ALTER TABLE is always in its own transaction */
-  error = ha_commit_stmt(thd);
-  if (ha_commit(thd))
-    error=1;
-  if (error)
-  {
-    VOID(pthread_mutex_unlock(&LOCK_open));
-    broadcast_refresh();
-    goto err;
-  }
   thd->proc_info="end";
   if (mysql_bin_log.is_open())
   {
@@ -4165,8 +4158,12 @@ copy_data_between_tables(TABLE *from,TAB
   }
   to->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
 
-  ha_enable_transaction(thd,TRUE);
-
+  if (ha_enable_transaction(thd, TRUE))
+  {
+    error= 1;
+    goto err;
+  }
+  
   /*
     Ensure that the new table is saved properly to disk so that we
     can do a rename

--- 1.21/mysql-test/r/innodb_mysql.result	2007-06-01 22:53:54 +05:00
+++ 1.22/mysql-test/r/innodb_mysql.result	2007-06-01 22:53:54 +05:00
@@ -617,4 +617,12 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE st
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	range	idx1,idx2	idx1	9	NULL	2	Using where; Using index
 DROP TABLE t1,t2;
+create table t1(a int) engine=innodb;
+alter table t1 comment '123';
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='123'
+drop table t1;
 End of 5.0 tests

--- 1.21/mysql-test/t/innodb_mysql.test	2007-06-01 22:53:54 +05:00
+++ 1.22/mysql-test/t/innodb_mysql.test	2007-06-01 22:53:54 +05:00
@@ -597,4 +597,12 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE st
 
 DROP TABLE t1,t2; 
 
+#
+# Bug #28652: assert when alter innodb table operation
+#
+create table t1(a int) engine=innodb;
+alter table t1 comment '123';
+show create table t1;
+drop table t1;
+
 --echo End of 5.0 tests