summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2010-05-12 13:42:12 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2010-05-12 13:42:12 +0300
commit28b63397903ef95bf36996cae22fc954cb792031 (patch)
treed5c5fa7bbfe1353d4edbfdad4eff29a3c97d9c4d /storage
parent805b2acfd5e543ac3dc15b7e2cb5b4c7882170e3 (diff)
downloadmariadb-git-28b63397903ef95bf36996cae22fc954cb792031.tar.gz
ha_innobase::add_index(): Reset trx->error_state in error handling.
(Bug #53591)
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/handler/handler0alter.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innodb_plugin/handler/handler0alter.cc b/storage/innodb_plugin/handler/handler0alter.cc
index e474c318c58..e936bfafa0e 100644
--- a/storage/innodb_plugin/handler/handler0alter.cc
+++ b/storage/innodb_plugin/handler/handler0alter.cc
@@ -894,6 +894,8 @@ error:
prebuilt->trx->error_info = NULL;
/* fall through */
default:
+ trx->error_state = DB_SUCCESS;
+
if (new_primary) {
if (indexed_table != innodb_table) {
row_merge_drop_table(trx, indexed_table);