1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed mode

Browse Source 
Backport of the patch for 5.1-bugteam.
This commit is contained in:
Alfranio Correia 2010-05-09 23:45:25 +01:00
parent df0b6707da
commit 209cccf55d
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result
View File

@ -341,6 +341,33 @@ ROLLBACK;
Warnings: Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back Warning 1196 Some non-transactional changed tables couldn't be rolled back
SET AUTOCOMMIT = 1; SET AUTOCOMMIT = 1;
---- Mixed statements Innodb ----
BEGIN;
INSERT INTO tndb VALUES (147);
INSERT INTO tinnodb SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
Warnings:
Note 1592 Statement may not be safe to log in statement format.
COMMIT;
INSERT INTO tndb VALUES (148);
BEGIN;
INSERT INTO tinnodb SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
Warnings:
Note 1592 Statement may not be safe to log in statement format.
INSERT INTO tndb VALUES (149);
COMMIT;
BEGIN;
INSERT INTO tndb VALUES (150);
INSERT INTO tmyisam SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
Warnings:
Note 1592 Statement may not be safe to log in statement format.
COMMIT;
INSERT INTO tndb VALUES (151);
BEGIN;
INSERT INTO tmyisam SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
Warnings:
Note 1592 Statement may not be safe to log in statement format.
INSERT INTO tndb VALUES (152);
COMMIT;
==== Verify the result ==== ==== Verify the result ====
SELECT * FROM tmyisam ORDER BY a; SELECT * FROM tmyisam ORDER BY a;
a a
@ -393,6 +420,8 @@ a
140 140
142 142
146 146
150
151
SELECT * FROM tinnodb ORDER BY a; SELECT * FROM tinnodb ORDER BY a;
a a
1 1
@ -420,6 +449,8 @@ a
120 120
125 125
127 127
147
148
SELECT * FROM tndb ORDER BY a; SELECT * FROM tndb ORDER BY a;
a a
2 2
@ -447,6 +478,12 @@ a
121 121
123 123
126 126
147
148
149
150
151
152
[on slave] [on slave]
Comparing tables master:test.tmyisam and slave:test.tmyisam Comparing tables master:test.tmyisam and slave:test.tmyisam
Comparing tables master:test.tinnodb and slave:test.tinnodb Comparing tables master:test.tinnodb and slave:test.tinnodb

23
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test
View File

@ -415,6 +415,29 @@ ROLLBACK;
SET AUTOCOMMIT = 1; SET AUTOCOMMIT = 1;
--echo ---- Mixed statements Innodb ----
BEGIN;
INSERT INTO tndb VALUES (147);
INSERT INTO tinnodb SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
COMMIT;
INSERT INTO tndb VALUES (148);
BEGIN;
INSERT INTO tinnodb SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
INSERT INTO tndb VALUES (149);
COMMIT;
BEGIN;
INSERT INTO tndb VALUES (150);
INSERT INTO tmyisam SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
COMMIT;
INSERT INTO tndb VALUES (151);
BEGIN;
INSERT INTO tmyisam SELECT * FROM tndb ORDER BY a DESC LIMIT 1;
INSERT INTO tndb VALUES (152);
COMMIT;
--echo ==== Verify the result ==== --echo ==== Verify the result ====

10
sql/sql_base.cc
View File

@ -5183,6 +5183,16 @@ int decide_logging_format(THD *thd, TABLE_LIST *tables)
thd->variables.binlog_format)); thd->variables.binlog_format));
DBUG_PRINT("info", ("multi_engine: %s", DBUG_PRINT("info", ("multi_engine: %s",
multi_engine ? "TRUE" : "FALSE")); multi_engine ? "TRUE" : "FALSE"));
/*
Reading from a self-logging engine and updating another engine
generates changes that are written to the binary log in the
statement format and may make slaves to diverge. In the mixed
mode, such changes should be written to the binary log in the
row format.
*/
if (multi_engine &&
(flags_some_set & HA_HAS_OWN_BINLOGGING))
thd->lex->set_stmt_unsafe();
int error= 0; int error= 0;
if (flags_all_set == 0) if (flags_all_set == 0)