database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge stella.local:/home2/mydev/mysql-5.1-amain

Browse Source 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
This commit is contained in:
istruewing@stella.local
2008-03-26 10:27:00 +01:00
parent bc683c6450 97531cadc9
commit 44fbe74e1e
178 changed files with 35784 additions and 27637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
View File

@@ -52,13 +52,13 @@ ROLLBACK;
BEGIN;
INSERT INTO tmyisam VALUES (5);
INSERT INTO tmyisam VALUES (6);
--warning 1196
#--warning 1196
ROLLBACK;
BEGIN;
INSERT INTO tndb VALUES (7);
INSERT INTO tmyisam VALUES (7);
--warning 1196
#--warning 1196
ROLLBACK;
SELECT * FROM tndb ORDER BY a;