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 | 17a21538047dd37caf5898110051fed10a7abca6 (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /mysql-test/r/rpl_flush_log_loop.result | |
| parent | d1d8d8379a2ab4f4d357d4b0909019b9c603d016 (diff) | |
| parent | 41a38d4789180c247a49e05ddf0be9c6c9f7811c (diff) | |
| download | mariadb-git-17a21538047dd37caf5898110051fed10a7abca6.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_flush_log_loop.result')
| -rw-r--r-- | mysql-test/r/rpl_flush_log_loop.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_flush_log_loop.result b/mysql-test/r/rpl_flush_log_loop.result index a1709647f19..5b5a47d438d 100644 --- a/mysql-test/r/rpl_flush_log_loop.result +++ b/mysql-test/r/rpl_flush_log_loop.result @@ -13,5 +13,5 @@ master_password='',master_port=SLAVE_PORT; start slave; flush logs; 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 SLAVE_PORT 60 slave-bin.000001 79 relay-log.000002 4 slave-bin.000001 Yes Yes 0 0 79 4 +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 SLAVE_PORT 60 slave-bin.000001 79 relay-log.000002 4 slave-bin.000001 Yes Yes 0 0 79 4 No |