diff options
| author | Horst Hunger <horst@mysql.com> | 2009-02-11 10:27:52 +0100 |
|---|---|---|
| committer | Horst Hunger <horst@mysql.com> | 2009-02-11 10:27:52 +0100 |
| commit | 48d4d34689c3fb8b0ba25f775b34ca5472568a33 (patch) | |
| tree | 093f55b3eb0039a97b7e05b1edd0f941564ab3c8 /mysql-test/t/rename.test | |
| parent | 4d0557a2e6e2f79e3662d3f10ea17656cf69ca12 (diff) | |
| download | mariadb-git-48d4d34689c3fb8b0ba25f775b34ca5472568a33.tar.gz | |
Reviewed fix for bug#40882: Replaced "sleep 1" by wait_condition, added save/restore start values and closed open sessions. When trying to use "wait_for_query_to_succeed" a type has been fixed, also in "rename.test": Added session count and check and replaced error numbers.
Diffstat (limited to 'mysql-test/t/rename.test')
| -rw-r--r-- | mysql-test/t/rename.test | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test index fce37d8466d..5aa1a51a90f 100644 --- a/mysql-test/t/rename.test +++ b/mysql-test/t/rename.test @@ -2,6 +2,8 @@ # Test of rename table # +--source include/count_sessions.inc + --disable_warnings drop table if exists t0,t1,t2,t3,t4; # Clear up from other tests (to ensure that SHOW TABLES below is right) @@ -19,16 +21,16 @@ rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; select * from t1; # The following should give errors ---error 1050,1050 +--error ER_TABLE_EXISTS_ERROR,ER_TABLE_EXISTS_ERROR rename table t1 to t2; ---error 1050,1050 +--error ER_TABLE_EXISTS_ERROR,ER_TABLE_EXISTS_ERROR rename table t1 to t1; ---error 1050,1050 +--error ER_TABLE_EXISTS_ERROR,ER_TABLE_EXISTS_ERROR rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2; show tables like "t_"; ---error 1050,1050 +--error ER_TABLE_EXISTS_ERROR,ER_TABLE_EXISTS_ERROR rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1; ---error 1017,1017 +--error ER_FILE_NOT_FOUND,ER_FILE_NOT_FOUND rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1; select * from t1; @@ -63,7 +65,7 @@ connection con2; # Wait for the the tables to be renamed # i.e the query below succeds let $query= select * from t2, t4; -source include/wait_for_query_to_suceed.inc; +source include/wait_for_query_to_succeed.inc; show tables; @@ -83,13 +85,15 @@ connection default; create table t1(f1 int); create view v1 as select * from t1; alter table v1 rename to v2; ---error 1146 +--error ER_NO_SUCH_TABLE alter table v1 rename to v2; rename table v2 to v1; ---error 1050 +--error ER_TABLE_EXISTS_ERROR rename table v2 to v1; drop view v1; drop table t1; - --echo End of 5.0 tests + +--source include/wait_until_count_sessions.inc + |