database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge with MySQL 5.1.42

Browse Source 
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()

storage/xtradb/handler/ha_innodb.cc:
  Call explain_filename() to get proper names for partitioned tables
This commit is contained in:
Michael Widenius
2010-01-15 17:27:55 +02:00
parent d121e66305 6d69089845
commit d8ecbbe634
254 changed files with 7306 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_table.cc
View File

@@ -5428,12 +5428,20 @@ binlog:
}
VOID(pthread_mutex_unlock(&LOCK_open));
IF_DBUG(int result=)
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)
{
IF_DBUG(int result=)
store_create_info(thd, table, &query,
create_info, FALSE /* show_database */);
DBUG_ASSERT(result == 0); // store_create_info() always return 0
write_bin_log(thd, TRUE, query.ptr(), query.length());
DBUG_ASSERT(result == 0); // store_create_info() always return 0
write_bin_log(thd, TRUE, query.ptr(), query.length());
}
}
else // Case 1
write_bin_log(thd, TRUE, thd->query(), thd->query_length());