diff options
| author | monty@mysql.com <> | 2004-09-02 16:57:26 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-09-02 16:57:26 +0300 |
| commit | dec44916c141565b41ddfcccdb3e9755b82bd744 (patch) | |
| tree | c8687c9c8877b4526e838a928b732b81f40f80ad /mysql-test/t | |
| parent | 054cea4ca8c1c86bd4434d5d068cf21e8623a5ff (diff) | |
| download | mariadb-git-dec44916c141565b41ddfcccdb3e9755b82bd744.tar.gz | |
After merge fixes
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/alter_table.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/lowercase_table.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index 317af337c46..eb35aa90fe2 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -110,14 +110,14 @@ drop database mysqltest; # # Rights for renaming test (Bug #3270) # -connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); +connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection root; --disable_warnings create database mysqltest; --enable_warnings create table mysqltest.t1 (a int,b int,c int); grant all on mysqltest.t1 to mysqltest_1@localhost; -connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,master.sock); +connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK); connection user1; -- error 1142 alter table t1 rename t2; diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/t/lowercase_table.test index 602a05a7848..b36d63bfd72 100644 --- a/mysql-test/t/lowercase_table.test +++ b/mysql-test/t/lowercase_table.test @@ -39,7 +39,6 @@ create database mysqltest; use MYSQLTEST; create table t1 (a int); select T1.a from MYSQLTEST.T1; ---error 1109 select t1.a from MYSQLTEST.T1; select mysqltest.t1.* from MYSQLTEST.t1; select MYSQLTEST.t1.* from MYSQLTEST.t1; @@ -48,6 +47,7 @@ select MYSQLTEST.T1.* from T1; alter table t1 rename to T1; select MYSQLTEST.t1.* from MYSQLTEST.t1; drop database mysqltest; +use test; # # multiupdate/delete & --lower-case-table-names |