diff options
| author | tsmith@sita.local <> | 2007-07-09 10:33:33 -0600 |
|---|---|---|
| committer | tsmith@sita.local <> | 2007-07-09 10:33:33 -0600 |
| commit | 59c570ba78bb0f67cb40f0403e1ca931e9f39014 (patch) | |
| tree | b7447a78c3e772d16b16c1b4f3b56adb47887205 /mysql-test | |
| parent | 5cba44239aaf6cb889ce06db7247d9a4172d9452 (diff) | |
| parent | 278a5dfa83b02cf3ad46c78345d85388863de4d6 (diff) | |
| download | mariadb-git-59c570ba78bb0f67cb40f0403e1ca931e9f39014.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into sita.local:/Users/tsmith/m/bk/maint/51
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result index eb0c1cdc81d..dfa23ac412d 100644 --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result @@ -123,7 +123,7 @@ Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 1364 -Last_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef +Last_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef. Unknown error Skip_Counter 0 Exec_Master_Log_Pos # Relay_Log_Space # diff --git a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result index 287ab072e3d..d5d0335d129 100644 --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result @@ -123,7 +123,7 @@ Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 1364 -Last_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef +Last_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef. Unknown error Skip_Counter 0 Exec_Master_Log_Pos # Relay_Log_Space # |