database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2005-06-10 14:34:43 +02:00
parent 25203acbb7 6f1c822d15
commit d340c0f52b
5 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/lock_multi.result
View File

@ -36,3 +36,10 @@ lock table t1 write, t2 write;
drop table t2;
ERROR 42S02: Table 'test.t2' doesn't exist
drop table t1;
create table t1(a int);
lock tables t1 write;
show columns from t1;
Field Type Null Key Default Extra
a int(11) YES NULL
unlock tables;
drop table t1;

6
mysql-test/r/mysql.result
View File

@ -48,3 +48,9 @@ Test 'go' command g
a
1
drop table t1;
create table t1(a int);
lock tables t1 write;
database()
test
unlock tables;
drop table t1;

12
mysql-test/t/lock_multi.test
View File

@ -94,3 +94,15 @@ connection reader;
reap;
connection locker;
drop table t1;
#
# BUG#9998 - MySQL client hangs on USE "database"
create table t1(a int);
lock tables t1 write;
connection reader;
show columns from t1;
connection locker;
unlock tables;
drop table t1;

11
mysql-test/t/mysql.test
View File

@ -30,5 +30,14 @@ select "Test 'go' command(vertical output) \G" as " ";
select "Test 'go' command \g" as " ";
--exec $MYSQL test -e 'select * from t1\g'
--enable_query_log
drop table t1;
#
# BUG9998 - MySQL client hangs on USE "database"
#
create table t1(a int);
lock tables t1 write;
--exec $MYSQL -e 'use test; select database();'
unlock tables;
drop table t1;