diff options
| author | unknown <dlenev@dlenev.mshome> | 2003-09-01 19:13:19 +0400 |
|---|---|---|
| committer | unknown <dlenev@dlenev.mshome> | 2003-09-01 19:13:19 +0400 |
| commit | 651898adfce345138363961769c6fdfd6da95532 (patch) | |
| tree | ada5568ccc464b89d3f3a8a4402ba5b483802999 /mysql-test/r/rpl_rotate_logs.result | |
| parent | b4d59a8dcfacbd40d138a1bfb0fd3785444f052f (diff) | |
| download | mariadb-git-651898adfce345138363961769c6fdfd6da95532.tar.gz | |
Updated various tests results which were missed during auto-merge
with replication over SSL patch.
mysql-test/r/rpl_error_ignored_table.result:
New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
Post merge update of SHOW SLAVE STATUS result
mysql-test/r/rpl_reset_slave.result:
New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
Fixed bad manual merge result
Diffstat (limited to 'mysql-test/r/rpl_rotate_logs.result')
| -rw-r--r-- | mysql-test/r/rpl_rotate_logs.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result index 0d9de8dc4c9..c472b313365 100644 --- a/mysql-test/r/rpl_rotate_logs.result +++ b/mysql-test/r/rpl_rotate_logs.result @@ -81,7 +81,7 @@ a testing temporary tables part 2 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 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 60 master-bin.000006 2886 slave-relay-bin.000001 7891 master-bin.000006 Yes Yes 0 0 2886 7891 No +127.0.0.1 root MASTER_PORT 60 master-bin.000004 2886 slave-relay-bin.000001 7891 master-bin.000004 Yes Yes 0 0 2886 7891 No lock tables t3 read; select count(*) from t3 where n >= 4; count(*) |