database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Initial merge result with mariaDB 10: lp:maria

Browse Source
This commit is contained in:
Seppo Jaakola
2013-07-13 13:01:13 +03:00
parent 58926b5e19
commit 0a9216835f
160 changed files with 9800 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@@ -6621,6 +6621,9 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
}
}
#ifdef WITH_WSREP
bool do_log_write(true);
#endif /* WITH_WSREP */
if (error == HA_ERR_WRONG_COMMAND)
{
error= 0;
@@ -6628,6 +6631,9 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA),
table->file->table_type(),
table->s->db.str, table->s->table_name.str);
#ifdef WITH_WSREP
WSREP_DEBUG("ignoring DDL failure: %d %s", error, thd->query());
#endif /* WITH_WSREP */
}
if (!error)