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

bug#31552 manual merge and post-make-test-run changes.

Browse Source
This commit is contained in:
aelkin@dl145j.mysql.com
2007-12-12 20:12:29 +01:00
parent 62d87757e3
commit ea68d51793
8 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result
View File

@ -301,7 +301,6 @@ SELECT COUNT(*) FROM history;
COUNT(*)
400
*** DUMP MASTER & SLAVE FOR COMPARE ********
set @@global.slave_exec_mode='IDEMPOTENT' /* to ignore missed records in mysql.proc */;
*************** TEST 2 CLEANUP SECTION ********************
DROP PROCEDURE IF EXISTS tpcb.load;
DROP PROCEDURE IF EXISTS tpcb.trans;

4
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
View File

@ -378,7 +378,7 @@ C1 C2
1 2
2 4
3 6
set @@global.slave_exec_mode= 'STRICT';
set @@global.slave_exec_mode= default;
--- on slave: old values should be overwritten by replicated values ---
SELECT * FROM t7 ORDER BY C1;
C1 C2
@ -430,10 +430,12 @@ START SLAVE;
**** On Master ****
INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M');
**** On Master ****
set @@global.slave_exec_mode= 'IDEMPOTENT';
DELETE FROM t1 WHERE C1 = 'L';
DELETE FROM t1;
SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
COUNT(*) 0
set @@global.slave_exec_mode= default;
Last_SQL_Error
0
SELECT COUNT(*) FROM t1 ORDER BY c1,c2;