diff options
| author | unknown <antony@pcg5ppc.xiphis.org> | 2007-09-12 13:35:39 -0700 |
|---|---|---|
| committer | unknown <antony@pcg5ppc.xiphis.org> | 2007-09-12 13:35:39 -0700 |
| commit | 23227604be3835440494ecd940c47db93d443ffe (patch) | |
| tree | a792af38558a909336bef7b9ae7db9e16f4c8feb /storage | |
| parent | db1f9468d4c4e4981fb4bc6e96de19766d0ca377 (diff) | |
| download | mariadb-git-23227604be3835440494ecd940c47db93d443ffe.tar.gz | |
undo unneccessary change to ha_innodb.cc
remove 'drop database' from new tests.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
remove "DROP DATABASE test"
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
remove "DROP DATABASE test"
mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
remove "DROP DATABASE test"
storage/innobase/handler/ha_innodb.cc:
undo unneccessary edits.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 2129bf61818..494f6ff233b 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -7130,7 +7130,6 @@ ha_innobase::innobase_read_and_init_auto_inc( int mysql_error = 0; dict_table_t* innodb_table = prebuilt->table; ibool trx_was_not_started = FALSE; - ulint error; ut_a(prebuilt); ut_a(prebuilt->table); @@ -7151,11 +7150,7 @@ ha_innobase::innobase_read_and_init_auto_inc( trx_search_latch_release_if_reserved(prebuilt->trx); - error = innobase_autoinc_lock(); - if (error != DB_SUCCESS) { - mysql_error = 1; - goto err; - } + dict_table_autoinc_lock(prebuilt->table); auto_inc = dict_table_autoinc_read(prebuilt->table); @@ -7168,6 +7163,7 @@ ha_innobase::innobase_read_and_init_auto_inc( if (auto_inc == 0) { dict_index_t* index; + ulint error; const char* autoinc_col_name; ut_a(!innodb_table->autoinc_inited); @@ -7195,7 +7191,6 @@ ha_innobase::innobase_read_and_init_auto_inc( dict_table_autoinc_unlock(prebuilt->table); -err: /* Since MySQL does not seem to call autocommit after SHOW TABLE STATUS (even if we would register the trx here), we commit our transaction here if it was started here. This is to eliminate a |