1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
This commit is contained in:
msvensson@neptunus.(none) 2005-06-10 14:34:43 +02:00
commit 6674e1e12e
5 changed files with 39 additions and 6 deletions
Show Stats 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; drop table t2;
ERROR 42S02: Table 'test.t2' doesn't exist ERROR 42S02: Table 'test.t2' doesn't exist
drop table t1; 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 a
1 1
drop table t1; 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; reap;
connection locker; connection locker;
drop table t1; 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 " "; select "Test 'go' command \g" as " ";
--exec $MYSQL test -e 'select * from t1\g' --exec $MYSQL test -e 'select * from t1\g'
--enable_query_log --enable_query_log
drop table t1; 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;

9
sql/sql_show.cc
View File

@ -348,7 +348,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
table_list->table_name)); table_list->table_name));
/* Only one table for now, but VIEW can involve several tables */ /* Only one table for now, but VIEW can involve several tables */
if (open_and_lock_tables(thd, table_list)) if (open_normal_and_derived_tables(thd, table_list))
{ {
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
@ -540,8 +540,7 @@ mysqld_list_fields(THD *thd, TABLE_LIST *table_list, const char *wild)
DBUG_ENTER("mysqld_list_fields"); DBUG_ENTER("mysqld_list_fields");
DBUG_PRINT("enter",("table: %s",table_list->table_name)); DBUG_PRINT("enter",("table: %s",table_list->table_name));
table_list->lock_type= TL_UNLOCK; if (open_normal_and_derived_tables(thd, table_list))
if (open_and_lock_tables(thd, table_list))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
table= table_list->table; table= table_list->table;
@ -1945,7 +1944,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
bool res; bool res;
lex->all_selects_list= lsel; lex->all_selects_list= lsel;
res= open_and_lock_tables(thd, show_table_list); res= open_normal_and_derived_tables(thd, show_table_list);
if (schema_table->process_table(thd, show_table_list, if (schema_table->process_table(thd, show_table_list,
table, res, show_table_list->db, table, res, show_table_list->db,
show_table_list->alias)) show_table_list->alias))
@ -2050,7 +2049,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
show_table_list->lock_type= lock_type; show_table_list->lock_type= lock_type;
lex->all_selects_list= &sel; lex->all_selects_list= &sel;
lex->derived_tables= 0; lex->derived_tables= 0;
res= open_and_lock_tables(thd, show_table_list); res= open_normal_and_derived_tables(thd, show_table_list);
if (schema_table->process_table(thd, show_table_list, table, if (schema_table->process_table(thd, show_table_list, table,
res, base_name, res, base_name,
show_table_list->alias)) show_table_list->alias))