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 merge error

Browse Source
This commit is contained in:
Jan Lindström
2013-09-04 09:54:40 +03:00
parent 6e8bfb0b26
commit 0880db5640
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_table.cc
View File

@ -7499,6 +7499,10 @@ simple_rename_or_index_change(THD *thd, TABLE_LIST *table_list,
: HA_EXTRA_FORCE_REOPEN; : HA_EXTRA_FORCE_REOPEN;
DBUG_ENTER("simple_rename_or_index_change"); DBUG_ENTER("simple_rename_or_index_change");
#ifdef WITH_WSREP
bool do_log_write(true);
#endif /* WITH_WSREP */
if (keys_onoff != Alter_info::LEAVE_AS_IS) if (keys_onoff != Alter_info::LEAVE_AS_IS)
{ {
if (wait_while_table_is_used(thd, table, extra_func)) if (wait_while_table_is_used(thd, table, extra_func))
@ -7557,7 +7561,14 @@ simple_rename_or_index_change(THD *thd, TABLE_LIST *table_list,
if (!error) if (!error)
{ {
error= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); #ifdef WITH_WSREP
if (!WSREP(thd) || do_log_write) {
#endif /* WITH_WSREP */
error= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
#ifdef WITH_WSREP
}
#endif /* !WITH_WSREP */
if (!error) if (!error)
my_ok(thd); my_ok(thd);
} }
@ -7857,9 +7868,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
bool res= simple_rename_or_index_change(thd, table_list, bool res= simple_rename_or_index_change(thd, table_list,
alter_info->keys_onoff, alter_info->keys_onoff,
&alter_ctx); &alter_ctx);
#ifdef WITH_WSREP
bool do_log_write(true);
#endif /* WITH_WSREP */
DBUG_RETURN(res); DBUG_RETURN(res);
} }