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

Post-merge fixes to make tests pass.

Browse Source 
mysql-test/r/binlog_start_comment.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Result change.
mysql-test/suite/rpl/r/rpl_timezone.result:
  Result change.
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  Result change.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Masking out columns with binlog positions from slave status.
mysql-test/t/binlog_start_comment.test:
  Added missing drop table causing subsequent tests to fail.
sql/log_event.cc:
  Changing last_err* fields to client_last_err*
sql/log_event_old.cc:
  Changing last_err* fields to client_last_err*
This commit is contained in:
unknown
2008-01-09 12:55:04 +01:00
parent a2409d6088
commit ac167eca6e
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;