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

Manual merge fixes/tests for bugs_28960,27417,23333.

Browse Source 
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  follow-up of the previous manual resolve. The snippet is moved into the heading
  file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  results changed
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  removing explicit offsets from report;
  appending bug#27417,23333,28960 related snippet, addressing left TODO:s.
mysql-test/suite/rpl/r/rpl_packet.result:
  results changed
mysql-test/suite/rpl/t/rpl_packet.test:
  fixing row/stmt compatibility with #-ing out unneeded values
This commit is contained in:
unknown
2007-09-16 12:07:00 +02:00
parent e35c1ab9a2
commit 68297025a0
5 changed files with 223 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/rpl/r/rpl_packet.result
View File

@ -34,7 +34,7 @@ Master_User root
Master_Port MASTER_MYPORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos 2138
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
@ -49,7 +49,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos 2138
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
@ -61,3 +61,8 @@ Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error