diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-02-26 17:17:17 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-10 13:12:36 +0200 |
commit | 35678c9572785ef11a8e0e0dfe72a77a09cf2b3f (patch) | |
tree | d82ba86a9a982de93b618b4281e67b280a5a81e6 /sql/sql_base.cc | |
parent | 09e6280147bbe2f880c47e9ea545b5af226f0aa0 (diff) | |
download | mariadb-git-35678c9572785ef11a8e0e0dfe72a77a09cf2b3f.tar.gz |
dead code - related to vtmd
(will be added back when it'll be used)
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 9f7e97dc3ff..3354a2fdf1b 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8821,31 +8821,10 @@ open_log_table(THD *thd, TABLE_LIST *one_table, Open_tables_backup *backup) if ((table= open_ltable(thd, one_table, one_table->lock_type, flags))) { - if (table->s->table_category == TABLE_CATEGORY_LOG) - { - /* Make sure all columns get assigned to a default value */ - table->use_all_columns(); - DBUG_ASSERT(table->s->no_replicate); - } - else - { - my_error(ER_NOT_LOG_TABLE, MYF(0), table->s->db.str, table->s->table_name.str); - int error= 0; - if (table->current_lock != F_UNLCK) - { - table->current_lock= F_UNLCK; - error= table->file->ha_external_lock(thd, F_UNLCK); - } - if (error) - table->file->print_error(error, MYF(0)); - else - { - tc_release_table(table); - thd->reset_open_tables_state(thd); - thd->restore_backup_open_tables_state(backup); - table= NULL; - } - } + DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_LOG); + /* Make sure all columns get assigned to a default value */ + table->use_all_columns(); + DBUG_ASSERT(table->s->no_replicate); } else thd->restore_backup_open_tables_state(backup); |