Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2165 06/04/18 18:10:47 msvensson@neptunus.(none) +14 -0
Cleanup test cases that leaves "stuff" behind
mysql-test/t/trigger.test
1.41 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -1
Drop table
mysql-test/t/sp_notembedded.test
1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop table
mysql-test/t/sp-security.test
1.32 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop users
mysql-test/t/rpl_openssl.test
1.12 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop users
mysql-test/t/openssl_1.test
1.14 06/04/18 18:10:42 msvensson@neptunus.(none) +3 -3
Drop users
mysql-test/t/grant2.test
1.34 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop users
mysql-test/t/ctype_latin2_ch.test
1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -0
Drop table
mysql-test/r/trigger.result
1.36 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -1
Drop table
mysql-test/r/sp_notembedded.result
1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop table
mysql-test/r/sp-security.result
1.29 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop users
mysql-test/r/rpl_openssl.result
1.12 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -1
Drop users
mysql-test/r/openssl_1.result
1.13 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -3
Drop users
mysql-test/r/grant2.result
1.28 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drop users
mysql-test/r/ctype_latin2_ch.result
1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
Drot table at end of test
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.0
--- 1.1/mysql-test/r/ctype_latin2_ch.result 2006-03-20 13:28:20 +01:00
+++ 1.2/mysql-test/r/ctype_latin2_ch.result 2006-04-18 18:10:42 +02:00
@@ -28,3 +28,4 @@
id tt
select * from t1 where tt like '%AA%';
id tt
+drop table t1;
--- 1.1/mysql-test/t/ctype_latin2_ch.test 2006-03-20 13:28:20 +01:00
+++ 1.2/mysql-test/t/ctype_latin2_ch.test 2006-04-18 18:10:42 +02:00
@@ -28,3 +28,5 @@
select * from t1 where tt like '%AA%';
# End of 4.1 tests
+
+drop table t1;
--- 1.11/mysql-test/r/rpl_openssl.result 2005-10-07 12:09:38 +02:00
+++ 1.12/mysql-test/r/rpl_openssl.result 2006-04-18 18:10:42 +02:00
@@ -24,7 +24,8 @@
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 master-bin.000001 474 # # master-bin.000001 Yes Yes 0 0 474 # 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 #
--- 1.35/mysql-test/r/trigger.result 2006-04-12 17:30:50 +02:00
+++ 1.36/mysql-test/r/trigger.result 2006-04-18 18:10:42 +02:00
@@ -949,7 +949,7 @@
create function f2() returns int return (select max(b) from t2);
insert into t2 select a, f2() from t1;
load data infile '../std_data_ln/words.dat' into table t1 (a) set b:= f1();
-drop table t1;
+drop table t1, t2;
drop function f1;
drop function f2;
DROP TABLE IF EXISTS t1;
--- 1.11/mysql-test/t/rpl_openssl.test 2005-10-12 13:58:08 +02:00
+++ 1.12/mysql-test/t/rpl_openssl.test 2006-04-18 18:10:42 +02:00
@@ -53,6 +53,7 @@
change master to master_user='root',master_password='', master_ssl=0;
start slave;
connection master;
+drop user replssl@localhost;
drop table t1;
save_master_pos;
connection slave;
--- 1.40/mysql-test/t/trigger.test 2006-04-12 17:30:51 +02:00
+++ 1.41/mysql-test/t/trigger.test 2006-04-18 18:10:42 +02:00
@@ -1111,7 +1111,7 @@
create function f2() returns int return (select max(b) from t2);
insert into t2 select a, f2() from t1;
load data infile '../std_data_ln/words.dat' into table t1 (a) set b:= f1();
-drop table t1;
+drop table t1, t2;
drop function f1;
drop function f2;
--- 1.1/mysql-test/r/sp_notembedded.result 2006-02-24 17:34:10 +01:00
+++ 1.2/mysql-test/r/sp_notembedded.result 2006-04-18 18:10:42 +02:00
@@ -204,3 +204,4 @@
drop procedure bug10100pd|
drop procedure bug10100pc|
drop view v1|
+drop table t3|
--- 1.1/mysql-test/t/sp_notembedded.test 2006-02-24 17:34:11 +01:00
+++ 1.2/mysql-test/t/sp_notembedded.test 2006-04-18 18:10:42 +02:00
@@ -258,5 +258,6 @@
drop procedure bug10100pd|
drop procedure bug10100pc|
drop view v1|
+drop table t3|
delimiter ;|
--- 1.28/mysql-test/r/sp-security.result 2006-03-02 14:23:39 +01:00
+++ 1.29/mysql-test/r/sp-security.result 2006-04-18 18:10:42 +02:00
@@ -322,6 +322,7 @@
Warning 1287 'SHOW INNODB STATUS' is deprecated; use 'SHOW ENGINE INNODB STATUS' instead
GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost;
DROP DATABASE db_bug7787;
+drop user user_bug7787@localhost;
use test;
---> connection: root
--- 1.31/mysql-test/t/sp-security.test 2006-03-02 14:23:39 +01:00
+++ 1.32/mysql-test/t/sp-security.test 2006-04-18 18:10:42 +02:00
@@ -545,6 +545,7 @@
# Cleanup.
DROP DATABASE db_bug7787;
+drop user user_bug7787@localhost;
use test;
--- 1.27/mysql-test/r/grant2.result 2006-04-18 10:46:11 +02:00
+++ 1.28/mysql-test/r/grant2.result 2006-04-18 18:10:42 +02:00
@@ -369,3 +369,4 @@
drop function f2;
drop table t2;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
+drop user `a@`@localhost;
--- 1.33/mysql-test/t/grant2.test 2006-04-18 10:46:11 +02:00
+++ 1.34/mysql-test/t/grant2.test 2006-04-18 18:10:42 +02:00
@@ -490,3 +490,4 @@
connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
+drop user `a@`@localhost;
--- 1.12/mysql-test/r/openssl_1.result 2005-10-04 15:43:40 +02:00
+++ 1.13/mysql-test/r/openssl_1.result 2006-04-18 18:10:42 +02:00
@@ -38,7 +38,6 @@
5
delete from t1;
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;
+drop user ssl_user1@localhost, ssl_user2@localhost,
+ssl_user3@localhost, ssl_user4@localhost;
drop table t1;
--- 1.13/mysql-test/t/openssl_1.test 2005-10-12 13:55:54 +02:00
+++ 1.14/mysql-test/t/openssl_1.test 2006-04-18 18:10:42 +02:00
@@ -48,9 +48,9 @@
delete from t1;
connection default;
-delete from mysql.user where user='ssl_user%';
-delete from mysql.db where user='ssl_user%';
-flush privileges;
+drop user ssl_user1@localhost, ssl_user2@localhost,
+ssl_user3@localhost, ssl_user4@localhost;
+
drop table t1;
# End of 4.1 tests
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2165) | msvensson | 18 Apr |
