diff options
| author | unknown <jimw@mysql.com> | 2006-05-01 00:14:32 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-01 00:14:32 -0700 |
| commit | a6c8de9163dad414ac2749e0fed7b776b7137212 (patch) | |
| tree | 8ef0c2d5e3dd04138fa175b2c147a5ae891ba2d1 /mysql-test/r/rpl_openssl.result | |
| parent | c3c5f8d6d73ff71e9b49d8ce0bf4fa4be865b1da (diff) | |
| download | mariadb-git-a6c8de9163dad414ac2749e0fed7b776b7137212.tar.gz | |
Clean up after big merge
config/ac-macros/yassl.m4:
Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
Don't start up ndbcluster slave if we don't need it, and fix how
NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
Update results
sql/mysqld.cc:
Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
Remove duplicate of prepared_stmt_count (bad merge)
Diffstat (limited to 'mysql-test/r/rpl_openssl.result')
| -rw-r--r-- | mysql-test/r/rpl_openssl.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_openssl.result b/mysql-test/r/rpl_openssl.result index 1bd28415434..4fe02088632 100644 --- a/mysql-test/r/rpl_openssl.result +++ b/mysql-test/r/rpl_openssl.result @@ -28,4 +28,4 @@ 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 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 # +# 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 # |