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

Post merge fixes of result files.

This commit is contained in:
mats@romeo.(none)
2007-03-30 04:44:49 +02:00
parent b463c78218
commit 55dd7f8bd8
31 changed files with 791 additions and 788 deletions

View File

@ -33,7 +33,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 1105
Last_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
Skip_Counter 0
Exec_Master_Log_Pos 245
Exec_Master_Log_Pos 246
Relay_Log_Space #
Until_Condition None
Until_Log_File
@ -115,7 +115,7 @@ FROM t2
ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c'
Skip_Counter 0
Exec_Master_Log_Pos 1277
Exec_Master_Log_Pos 1278
Relay_Log_Space #
Until_Condition None
Until_Log_File