1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Don't write DROP TEMPORARY TABLE to binary log

if we didn't write the CREATE TEMPORARY TABLE statement.

- Enable old code from one of my older changesets that didn't make into 10.0
- Fix test cased that failed as they expected DROP TEMPORARY TABLE in the log.
This commit is contained in:
Monty
2015-05-11 23:11:05 +03:00
committed by Sergei Golubchik
parent d2f6166ec5
commit b2b07b33cf
17 changed files with 15 additions and 371 deletions

View File

@ -293,7 +293,7 @@ while ($ddl_cases >= 1)
# 3: ROW EVENT
# 4: COMMIT
#
if (`select @@binlog_format = 'STATEMENT'`)
if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'ROW'`)
{
let $commit_event_row_number= 4;
}
@ -302,10 +302,10 @@ while ($ddl_cases >= 1)
# 1: BEGIN
# 2: TABLE MAP EVENT
# 3: ROW EVENT
# 4: DROP TEMPORARY table IF EXISTS
# 4: DROP TEMPORARY
# 5: COMMIT
#
if (`select @@binlog_format = 'MIXED' || @@binlog_format = 'ROW'`)
if (`select @@binlog_format = 'MIXED'`)
{
let $commit_event_row_number= 5;
}