diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-07-09 12:07:33 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-07-09 12:07:33 +0200 |
| commit | 58353a7080e6492f3cc0f9b5f5133053801487e7 (patch) | |
| tree | 9e453319866e8de5e8a0d4a19861b57dbd58d4fd /mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result | |
| parent | 49bc3c26689b40516b7bbdb93b5cf6b58367c3e5 (diff) | |
| parent | ba6c552b9b1dbab71c49e5c17b25bb09fb4c048f (diff) | |
| download | mariadb-git-58353a7080e6492f3cc0f9b5f5133053801487e7.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
manual merge
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
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 17c591327c2..e94af83df3f 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 # |