diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | dfc63866eb91ce5274647dc1176e2f98b5954a50 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /sql/sql_table.cc | |
| parent | 14b769cfc6bcf5e6b3142d12e26667bcec90b2cd (diff) | |
| parent | c33caca3a45cb72ed3354561d4ff9f06dc12466c (diff) | |
| download | mariadb-git-dfc63866eb91ce5274647dc1176e2f98b5954a50.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 0447e1a24af..02a874ce62f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6473,7 +6473,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, uint index_add_count= 0; uint *index_add_buffer= NULL; uint candidate_key_count= 0; - bool committed= 0; bool no_pk; DBUG_ENTER("mysql_alter_table"); @@ -7302,7 +7301,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, DBUG_PRINT("info", ("Committing before unlocking table")); if (trans_commit_stmt(thd) || trans_commit_implicit(thd)) goto err_new_table_cleanup; - committed= 1; } /*end of if (! new_table) for add/drop index*/ |