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

Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc

Browse Source
This commit is contained in:
Marc Alff
2009-12-16 15:48:55 -07:00
parent 0531f85e16 5cd3dffebb
commit 0d99234dba
242 changed files with 5392 additions and 1733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_table.cc
View File

@ -5401,13 +5401,21 @@ binlog:
}
mysql_mutex_unlock(&LOCK_open);
int result __attribute__((unused))=
store_create_info(thd, table, &query,
create_info, FALSE /* show_database */);
/*
The condition avoids a crash as described in BUG#48506. Other
binlogging problems related to CREATE TABLE IF NOT EXISTS LIKE
when the existing object is a view will be solved by BUG 47442.
*/
if (!table->view)
{
int result __attribute__((unused))=
store_create_info(thd, table, &query,
create_info, FALSE /* show_database */);
DBUG_ASSERT(result == 0); // store_create_info() always return 0
if (write_bin_log(thd, TRUE, query.ptr(), query.length()))
goto err;
DBUG_ASSERT(result == 0); // store_create_info() always return 0
if (write_bin_log(thd, TRUE, query.ptr(), query.length()))
goto err;
}
}
else // Case 1
if (write_bin_log(thd, TRUE, thd->query(), thd->query_length()))