Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3)

into "trunk-build".

Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3)
into "trunk-build".
7810f50a · Joerg Bruehe · 4a9cc7ea · a8037cbf · 7810f50a · 7810f50a
Commit 7810f50a authored Aug 27, 2009 by Joerg Bruehe
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

configure.in configure.in +1 -1

storage/innobase/handler/handler0alter.cc storage/innobase/handler/handler0alter.cc +1 -0

No files found.
--- a/configure.in
+++ b/configure.in
@@ -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

--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -863,6 +863,7 @@ ha_innobase::add_index(
 		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: