Commit 8b8647ff authored by unknown's avatar unknown
Browse files

Cleanup after test cases 


mysql-test/r/init_connect.result:
  Restore global variable to the value it's set to when server is started
mysql-test/r/key_cache.result:
  Restore global variable values to original
mysql-test/r/mysqldump.result:
  Drop the user that was created. Specifying "drop user myDB_user" is equal to "drop user myDB_user@%"
mysql-test/r/rpl_deadlock.result:
  Restore global variable values to original
mysql-test/r/rpl_drop_db.result:
  Remove the conflicting file and drop database mysqltest1 before test exits
mysql-test/r/rpl_ignore_revoke.result:
  As changes to mysql.* are ignored - explicitly delete the user on slave
mysql-test/r/rpl_init_slave.result:
  Restore global variable values to original
mysql-test/r/rpl_max_relay_size.result:
  Restore global variable values to original
mysql-test/r/rpl_sp.result:
  Restore global variable values to original
mysql-test/r/rpl_timezone.result:
  Restore global variable values to original
mysql-test/r/rpl_variables.result:
  Restore global variable values to original
mysql-test/r/view_grant.result:
  Use same user in all places in the same test "readonly" is equal to "readonly@%" not "readonly@localhost"
mysql-test/t/init_connect.test:
  Restore global variable to the value it's set to when server is started
mysql-test/t/key_cache.test:
  Restore global variable values to original
mysql-test/t/mysqldump.test:
  Drop the user that was created. Specifying "drop user myDB_user" is equal to "drop user myDB_user@%"
mysql-test/t/rpl_deadlock.test:
  Restore global variable values to original
mysql-test/t/rpl_drop_db.test:
  Remove the conflicting file and drop database mysqltest1 before test exits
mysql-test/t/rpl_ignore_revoke.test:
  As changes to mysql.* are ignored - explicitly delete the user on slave
mysql-test/t/rpl_init_slave.test:
  Restore global variable values to original
mysql-test/t/rpl_max_relay_size.test:
  Restore global variable values to original
mysql-test/t/rpl_sp.test:
  Restore global variable values to original
mysql-test/t/rpl_timezone.test:
  Restore global variable values to original
mysql-test/t/rpl_variables.test:
  Restore global variable values to original
mysql-test/t/view_grant.test:
  Use same user in all places in the same test "readonly" is equal to "readonly@%" not "readonly@localhost"
parent b7dd49b0

mysql-test/r/init_connect.result

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ x 
17

19

drop trigger trg1;

set global init_connect=default;

set global init_connect="set @a='a\\0c'";

revoke all privileges, grant option from mysqltest1@localhost;

drop user mysqltest1@localhost;

drop table t1, t2;

mysql-test/r/key_cache.result

+4 −0
Original line number Diff line number Diff line
@@ -284,12 +284,15 @@ insert t1 values ('aaabbb'); 
check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

set @my_key_cache_block_size= @@global.key_cache_block_size;

set GLOBAL key_cache_block_size=2048;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

set global key_cache_block_size= @my_key_cache_block_size;

CREATE TABLE t1(a int NOT NULL AUTO_INCREMENT PRIMARY KEY);

SET @my_key_cache_block_size= @@global.key_cache_block_size;

SET GLOBAL key_cache_block_size=1536;

INSERT INTO t1 VALUES (1);

SELECT @@key_cache_block_size;
@@ -331,6 +334,7 @@ CHECK TABLE t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1,t2;

set global key_cache_block_size= @my_key_cache_block_size;

set @@global.key_buffer_size=0;

Warnings:

Warning	1438	Cannot drop default keycache

mysql-test/r/mysqldump.result

+3 −3
Original line number Diff line number Diff line
@@ -3089,7 +3089,7 @@ drop user mysqltest_1@localhost; 
#

create database mysqldump_myDB;

use mysqldump_myDB;

create user myDB_User;

create user myDB_User@localhost;

grant create, create view, select, insert on mysqldump_myDB.* to myDB_User@localhost;

create table t1 (c1 int);

insert into t1 values (3);
@@ -3102,7 +3102,7 @@ drop view v1; 
drop table t1;

drop table u1;

revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;

drop user myDB_User;

drop user myDB_User@localhost;

drop database mysqldump_myDB;

flush privileges;

# Bug #21424 continues from here.
@@ -3120,7 +3120,7 @@ drop view v1; 
drop table t1;

drop table u1;

revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;

drop user myDB_User;

drop user myDB_User@localhost;

drop database mysqldump_myDB;

use test;

#

mysql-test/r/rpl_deadlock.result

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

set @my_max_relay_log_size= @@global.max_relay_log_size;

set global max_relay_log_size=0;

stop slave;

change master to master_log_pos=532;
@@ -178,3 +179,4 @@ Master_SSL_Cipher 
Master_SSL_Key	

Seconds_Behind_Master	#

drop table t1,t2,t3,t4;

set global max_relay_log_size= @my_max_relay_log_size;

mysql-test/r/rpl_drop_db.result

+2 −0
Original line number Diff line number Diff line
@@ -33,3 +33,5 @@ n 
1234

drop table t1;

stop slave;

drop database mysqltest1;

drop database mysqltest1;