diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:43:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:43:42 +0200 |
| commit | d1fdb17bfb774e4e29c8a337b497128fd01a3473 (patch) | |
| tree | 3965911387619c3b17e933bb3863651b4ad94990 /sql/sql_table.cc | |
| parent | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (diff) | |
| download | mariadb-git-d1fdb17bfb774e4e29c8a337b497128fd01a3473.tar.gz | |
cosmetic fixes
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 79c6d4cbaf9..ca5e71f6ea8 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -7834,9 +7834,11 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, handle_if_exists_options(thd, table, alter_info); - /* Look if we have to do anything at all. */ - /* Normally ALTER can become NOOP only after handling */ - /* the IF (NOT) EXISTS options. */ + /* + Look if we have to do anything at all. + Normally ALTER can become NOOP only after handling + the IF (NOT) EXISTS options. + */ if (alter_info->flags == 0) { my_snprintf(alter_ctx.tmp_name, sizeof(alter_ctx.tmp_name), @@ -8238,26 +8240,23 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, if (lock_tables(thd, table_list, alter_ctx.tables_opened, 0)) goto err_new_table_cleanup; - { - if (ha_create_table(thd, alter_ctx.get_tmp_path(), - alter_ctx.new_db, alter_ctx.tmp_name, - create_info, &frm)) - goto err_new_table_cleanup; + if (ha_create_table(thd, alter_ctx.get_tmp_path(), + alter_ctx.new_db, alter_ctx.tmp_name, + create_info, &frm)) + goto err_new_table_cleanup; - /* Mark that we have created table in storage engine. */ - no_ha_table= false; + /* Mark that we have created table in storage engine. */ + no_ha_table= false; - if (create_info->tmp_table()) - { - if (!open_table_uncached(thd, new_db_type, - alter_ctx.get_tmp_path(), - alter_ctx.new_db, alter_ctx.tmp_name, - true, true)) - goto err_new_table_cleanup; - } + if (create_info->tmp_table()) + { + if (!open_table_uncached(thd, new_db_type, + alter_ctx.get_tmp_path(), + alter_ctx.new_db, alter_ctx.tmp_name, + true, true)) + goto err_new_table_cleanup; } - /* Open the table since we need to copy the data. */ if (table->s->tmp_table != NO_TMP_TABLE) { |