diff options
| author | unknown <dlenev@mysql.com> | 2003-09-01 16:14:54 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2003-09-01 16:14:54 +0400 |
| commit | b4d59a8dcfacbd40d138a1bfb0fd3785444f052f (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /mysql-test/r/rpl_log.result | |
| parent | ba91207f1eba9af153fe8426af3688ea196cc1e9 (diff) | |
| parent | 8a548ffd9c46f111d480b51a1e30dad44433ba80 (diff) | |
| download | mariadb-git-b4d59a8dcfacbd40d138a1bfb0fd3785444f052f.tar.gz | |
Manual merge fixes
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
Mabual merge
mysql-test/r/rpl_flush_log_loop.result:
Mabual merge
mysql-test/r/rpl_log.result:
Mabual merge
mysql-test/r/rpl_log_pos.result:
Mabual merge
mysql-test/r/rpl_replicate_do.result:
Mabual merge
mysql-test/r/rpl_rotate_logs.result:
Mabual merge
sql/slave.cc:
Mabual merge
sql/slave.h:
Mabual merge
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index ab45826a3e7..1583ac3038d 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -92,7 +92,7 @@ slave-bin.000002 4 Query 1 110 use `test`; create table t1 (n int) slave-bin.000002 62 Query 1 168 use `test`; insert into t1 values (1) slave-bin.000002 122 Query 1 228 use `test`; drop table t1 show slave status; -Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Replicate_do_table Replicate_ignore_table Replicate_wild_do_table Replicate_wild_ignore_table Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root MASTER_PORT 1 master-bin.000002 276 slave-relay-bin.000003 214 master-bin.000002 Yes Yes 0 0 276 214 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Replicate_do_table Replicate_ignore_table Replicate_wild_do_table Replicate_wild_ignore_table Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key +127.0.0.1 root MASTER_PORT 1 master-bin.000002 276 slave-relay-bin.000003 214 master-bin.000002 Yes Yes 0 0 276 214 No show binlog events in 'slave-bin.000005' from 4; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log |