database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge gbichot3.local:/home/mysql_src/mysql-5.1

Browse Source 
into  gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_create_table.result:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
This commit is contained in:
unknown
2006-07-06 17:56:26 +02:00
parent 986679a287 81bb604c63
commit b5faf11ab6
7 changed files with 66 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_insert.cc
View File

@ -2732,7 +2732,8 @@ public:
MY_HOOKS(select_create *x) : ptr(x) { }
virtual void do_prelock(TABLE **tables, uint count)
{
if (ptr->get_thd()->current_stmt_binlog_row_based)
if (ptr->get_thd()->current_stmt_binlog_row_based &&
!(ptr->get_create_info()->options & HA_LEX_CREATE_TMP_TABLE))
ptr->binlog_show_create_table(tables, count);
}