diff options
author | Alfranio Correia <alfranio.correia@sun.com> | 2010-05-09 23:45:25 +0100 |
---|---|---|
committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-05-09 23:45:25 +0100 |
commit | 209cccf55dd39d0be7eb4635b7c397b36941b825 (patch) | |
tree | 611b0494224847e2be5a1cdd101562653016f1d8 /mysql-test | |
parent | df0b6707dabf49ed09e798c6ace1d860320ab11c (diff) | |
download | mariadb-git-209cccf55dd39d0be7eb4635b7c397b36941b825.tar.gz |
BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed mode
Backport of the patch for 5.1-bugteam.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result | 37 | ||||
-rw-r--r-- | mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test | 23 |
2 files changed, 60 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result index da60b0bbbbf..e02c3b23cad 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result @@ -341,6 +341,33 @@ ROLLBACK; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back 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 ==== SELECT * FROM tmyisam ORDER BY a; a @@ -393,6 +420,8 @@ a 140 142 146 +150 +151 SELECT * FROM tinnodb ORDER BY a; a 1 @@ -420,6 +449,8 @@ a 120 125 127 +147 +148 SELECT * FROM tndb ORDER BY a; a 2 @@ -447,6 +478,12 @@ a 121 123 126 +147 +148 +149 +150 +151 +152 [on slave] Comparing tables master:test.tmyisam and slave:test.tmyisam Comparing tables master:test.tinnodb and slave:test.tinnodb diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test index 14b76722fa6..22ccabe3745 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test @@ -415,6 +415,29 @@ ROLLBACK; 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 ==== |