diff options
| author | jimw@mysql.com <> | 2006-04-30 13:27:38 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2006-04-30 13:27:38 -0700 |
| commit | f21c110d138990de057d7d69971f60bfc678f737 (patch) | |
| tree | 4149d104692e9dafa62ff0ddb7174a16b4a47013 /mysql-test/r/rpl_openssl.result | |
| parent | 08eb2588bffdf1b5a2f06ee1a6e5d7c189ed2201 (diff) | |
| parent | bad7e32a949982c07a738ce83bc5f87a562d90a3 (diff) | |
| download | mariadb-git-f21c110d138990de057d7d69971f60bfc678f737.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
Diffstat (limited to 'mysql-test/r/rpl_openssl.result')
| -rw-r--r-- | mysql-test/r/rpl_openssl.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_openssl.result b/mysql-test/r/rpl_openssl.result index be9ab29d8b7..1bd28415434 100644 --- a/mysql-test/r/rpl_openssl.result +++ b/mysql-test/r/rpl_openssl.result @@ -24,7 +24,8 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File stop slave; change master to master_user='root',master_password='', master_ssl=0; start slave; +drop user replssl@localhost; drop table t1; show slave status; Slave_IO_State 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 Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master -# 127.0.0.1 root MASTER_MYPORT 1 # # # # # # Yes # 0 0 # # None 0 No MYSQL_TEST_DIR/std_data/cacert.pem MYSQL_TEST_DIR/std_data/client-cert.pem MYSQL_TEST_DIR/std_data/client-key.pem # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 564 # # master-bin.000001 Yes Yes 0 0 564 # None 0 No MYSQL_TEST_DIR/std_data/cacert.pem MYSQL_TEST_DIR/std_data/client-cert.pem MYSQL_TEST_DIR/std_data/client-key.pem # |