diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-07 15:39:11 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-07 15:39:11 +0000 |
| commit | 5dcb0e447fe2dbcb4584e9db15836eaf4c1da0a1 (patch) | |
| tree | e9c523980c16c054c3f387b57137661edf708689 /mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result | |
| parent | e284f50681523023fecab1b655e0c839625e1e2e (diff) | |
| parent | 444b24eec2021c1bf802be7e037350947b654622 (diff) | |
| download | mariadb-git-5dcb0e447fe2dbcb4584e9db15836eaf4c1da0a1.tar.gz | |
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
Text conflict in mysql-test/r/mysqlbinlog2.result
Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result
Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
Text conflict in mysql-test/suite/rpl/r/rpl_udf.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Text conflict in sql/field.h
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysql_priv.h
Text conflict in sql/share/errmsg.txt
Text conflict in sql/sp.cc
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_db.cc
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_insert.cc
Text conflict in sql/sql_lex.cc
Text conflict in sql/sql_lex.h
Text conflict in sql/sql_load.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_update.cc
Text conflict in sql/sql_view.cc
Conflict adding files to storage/innobase. Created directory.
Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory.
Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved.
Conflict adding files to storage/innobase/handler. Created directory.
Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory.
Contents conflict in storage/innobase/handler/ha_innodb.cc
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 | 12 |
1 files changed, 6 insertions, 6 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 8a87c3ca7a0..04f22a864e1 100644 --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result @@ -180,7 +180,7 @@ Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table -Last_Errno 1535 +Last_Errno 1677 Last_Error <Last_Error> Skip_Counter 0 Exec_Master_Log_Pos # @@ -198,7 +198,7 @@ Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No Last_IO_Errno <Last_IO_Errno> Last_IO_Error <Last_IO_Error> -Last_SQL_Errno 1535 +Last_SQL_Errno 1677 Last_SQL_Error <Last_SQL_Error> Replicate_Ignore_Server_Ids Master_Server_Id 1 @@ -225,7 +225,7 @@ Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table -Last_Errno 1535 +Last_Errno 1677 Last_Error <Last_Error> Skip_Counter 0 Exec_Master_Log_Pos # @@ -243,7 +243,7 @@ Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No Last_IO_Errno <Last_IO_Errno> Last_IO_Error <Last_IO_Error> -Last_SQL_Errno 1535 +Last_SQL_Errno 1677 Last_SQL_Error <Last_SQL_Error> Replicate_Ignore_Server_Ids Master_Server_Id 1 @@ -270,7 +270,7 @@ Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table -Last_Errno 1535 +Last_Errno 1677 Last_Error <Last_Error> Skip_Counter 0 Exec_Master_Log_Pos # @@ -288,7 +288,7 @@ Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No Last_IO_Errno <Last_IO_Errno> Last_IO_Error <Last_IO_Error> -Last_SQL_Errno 1535 +Last_SQL_Errno 1677 Last_SQL_Error <Last_SQL_Error> Replicate_Ignore_Server_Ids Master_Server_Id 1 |