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

Post-merge fixes to make tests pass.

Browse Source
This commit is contained in:
mats@capulet.kindahl.net
2008-01-09 12:55:04 +01:00
parent 6a5e4e3f71
commit 6e94fb84ae
9 changed files with 32 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ Master_User root
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 1740
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
@ -116,7 +116,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 1579
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File

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

@ -7,7 +7,6 @@
source include/ndb_master-slave.inc;
source include/have_ndb.inc;
CREATE TABLE tmyisam (a int) ENGINE = MYISAM;
CREATE TABLE tinnodb (a int) ENGINE = INNODB;
CREATE TABLE tndb (a int) ENGINE = NDB;
@ -111,7 +110,9 @@ SELECT * FROM tinnodb ORDER BY a;
--connection slave
--sleep 3
STOP SLAVE;
--source include/show_slave_status.inc
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS;
# the following statement should show that nothing has been replicated
SELECT * FROM tinnodb ORDER BY a;