diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index a291ce73210..2723286a405 100644 --- 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 diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index d1f64a1985c..5075b841879 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -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: |