mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment
This commit is contained in:
commit
7eb789a723
397 changed files with 15123 additions and 3589 deletions
|
|
@ -711,7 +711,7 @@ Event_db_repository::update_event(THD *thd, Event_parse_data *parse_data,
|
|||
DBUG_ENTER("Event_db_repository::update_event");
|
||||
|
||||
/* None or both must be set */
|
||||
DBUG_ASSERT(new_dbname && new_name || new_dbname == new_name);
|
||||
DBUG_ASSERT((new_dbname && new_name) || new_dbname == new_name);
|
||||
|
||||
/* Reset sql_mode during data dictionary operations. */
|
||||
thd->variables.sql_mode= 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue