bzr commit into mysql-5.4 branch (joerg:2875)

[Joerg Bruehe]

#At file:///MySQL/REPO/V54/push-5.4/ based on revid:joerg@stripped

 2875 Joerg Bruehe	2009-08-27 [merge]
      Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3)
      into "trunk-build".

    modified:
      configure.in
      storage/innobase/handler/handler0alter.cc
=== modified file 'configure.in'
--- a/configure.in	2009-08-12 13:44:34 +0000
+++ b/configure.in	2009-08-26 09:59:49 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in client/mysqlbinlog.cc:check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.4.2-beta)
+AM_INIT_AUTOMAKE(mysql, 5.4.3-beta)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	2009-07-30 12:42:56 +0000
+++ b/storage/innobase/handler/handler0alter.cc	2009-08-25 15:12:44 +0000
@@ -863,6 +863,7 @@ error_handling:
 		indexed_table->n_mysql_handles_opened++;
 
 		error = row_merge_drop_table(trx, innodb_table);
+		innodb_table = indexed_table;
 		goto convert_error;
 
 	case DB_TOO_BIG_RECORD:


Attachment: [text/bzr-bundle] bzr/[e-mail]