database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix compilation w/o partitioning

Browse Source 
followup for d8da920264
This commit is contained in:
Sergei Golubchik
2018-06-14 09:08:41 +02:00
parent 5d6b7f46fb
commit 776fc87686
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_alter.cc
View File

@ -303,7 +303,6 @@ bool Sql_cmd_alter_table::execute(THD *thd)
create_info.data_file_name= create_info.index_file_name= NULL; create_info.data_file_name= create_info.index_file_name= NULL;
thd->enable_slow_log= opt_log_slow_admin_statements; thd->enable_slow_log= opt_log_slow_admin_statements;
thd->work_part_info= 0;
#ifdef WITH_WSREP #ifdef WITH_WSREP
TABLE *find_temporary_table(THD *thd, const TABLE_LIST *tl); TABLE *find_temporary_table(THD *thd, const TABLE_LIST *tl);

1
sql/sql_parse.cc
View File

@ -3315,7 +3315,6 @@ mysql_execute_command(THD *thd)
create_info.add(DDL_options_st::OPT_OR_REPLACE_SLAVE_GENERATED); create_info.add(DDL_options_st::OPT_OR_REPLACE_SLAVE_GENERATED);
} }
thd->work_part_info= 0;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
{ {
partition_info *part_info= thd->lex->part_info; partition_info *part_info= thd->lex->part_info;

3
sql/sql_table.cc
View File

@ -6060,7 +6060,6 @@ remove_key:
} }
} }
DBUG_ASSERT(thd->work_part_info == 0);
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *tab_part_info= table->part_info; partition_info *tab_part_info= table->part_info;
thd->work_part_info= thd->lex->part_info; thd->work_part_info= thd->lex->part_info;
@ -8415,8 +8414,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
{ {
DBUG_ENTER("mysql_alter_table"); DBUG_ENTER("mysql_alter_table");
thd->work_part_info= 0; // Used by partitioning
/* /*
Check if we attempt to alter mysql.slow_log or Check if we attempt to alter mysql.slow_log or
mysql.general_log table and return an error if mysql.general_log table and return an error if

2
sql/table.cc
View File

@ -2233,7 +2233,9 @@ int TABLE_SHARE::init_from_sql_statement_string(THD *thd, bool write,
goto ret; goto ret;
thd->lex->create_info.db_type= hton; thd->lex->create_info.db_type= hton;
#ifdef WITH_PARTITION_STORAGE_ENGINE
thd->work_part_info= 0; // For partitioning thd->work_part_info= 0; // For partitioning
#endif
if (tabledef_version.str) if (tabledef_version.str)
thd->lex->create_info.tabledef_version= tabledef_version; thd->lex->create_info.tabledef_version= tabledef_version;