Commit 231fdb4b authored by unknown's avatar unknown
Browse files

BUG#9521 fix: 

openssl_1 and rpl_openssl results difference


mysql-test/r/openssl_1.result:
  Fix expected error messages.
mysql-test/r/rpl_openssl.result:
  Fix show slave status output. This fix makes rpl_openssl work with openssl-0.9.7 and yassl.
mysql-test/t/openssl_1.test:
  Fix expected error codes.
parent 750180d2

mysql-test/r/openssl_1.result

+4 −4
Original line number Diff line number Diff line
@@ -10,22 +10,22 @@ select * from t1; 
f1

5

delete from t1;

ERROR 42000: Access denied for user 'ssl_user1'@'localhost' to database 'test'

ERROR 42000: DELETE command denied to user 'ssl_user1'@'localhost' for table 't1'

select * from t1;

f1

5

delete from t1;

ERROR 42000: Access denied for user 'ssl_user2'@'localhost' to database 'test'

ERROR 42000: DELETE command denied to user 'ssl_user2'@'localhost' for table 't1'

select * from t1;

f1

5

delete from t1;

ERROR 42000: Access denied for user 'ssl_user3'@'localhost' to database 'test'

ERROR 42000: DELETE command denied to user 'ssl_user3'@'localhost' for table 't1'

select * from t1;

f1

5

delete from t1;

ERROR 42000: Access denied for user 'ssl_user4'@'localhost' to database 'test'

ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table 't1'

delete from mysql.user where user='ssl_user%';

delete from mysql.db where user='ssl_user%';

flush privileges;

mysql-test/r/rpl_openssl.result

+2 −2
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ t 
1

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	replssl	MASTER_MYPORT	1	master-bin.000001	289	slave-relay-bin.000001	108	master-bin.000001	Yes	Yes							0		0	289	108	None		0	Yes	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	replssl	MASTER_MYPORT	1	master-bin.000001	392	#	#	master-bin.000001	Yes	Yes							0		0	392	#	None		0	Yes	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#

stop slave;

change master to master_user='root',master_password='', master_ssl=0;

start slave;

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	337	slave-relay-bin.000001	96	master-bin.000001	Yes	Yes							0		0	337	96	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	468	#	#	master-bin.000001	Yes	Yes							0		0	468	#	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	#

mysql-test/t/openssl_1.test

+4 −4
Original line number Diff line number Diff line
@@ -20,22 +20,22 @@ connect (con4,localhost,ssl_user4,,); 


connection con1;

select * from t1;

--error 1044;

--error 1142;

delete from t1;



connection con2;

select * from t1;

--error 1044;

--error 1142;

delete from t1;



connection con3;

select * from t1;

--error 1044;

--error 1142;

delete from t1;



connection con4;

select * from t1;

--error 1044;

--error 1142;

delete from t1;



connection default;