Commit e0075179 authored by unknown's avatar unknown

Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines

parents 0d4fb8b4 44df0f6e
...@@ -1638,4 +1638,6 @@ show open tables where f1()=0; ...@@ -1638,4 +1638,6 @@ show open tables where f1()=0;
show open tables where f1()=0; show open tables where f1()=0;
drop table t1; drop table t1;
drop function f1; drop function f1;
select * from information_schema.tables where 1=sleep(100000);
select * from information_schema.columns where 1=sleep(100000);
End of 5.1 tests. End of 5.1 tests.
...@@ -1270,4 +1270,48 @@ show open tables where f1()=0; ...@@ -1270,4 +1270,48 @@ show open tables where f1()=0;
drop table t1; drop table t1;
drop function f1; drop function f1;
#
# BUG#34656 - KILL a query = Assertion failed: m_status == DA_ERROR ||
# m_status == DA_OK
#
connect (conn1, localhost, root,,);
connection conn1;
let $ID= `select connection_id()`;
send select * from information_schema.tables where 1=sleep(100000);
connection default;
let $wait_timeout= 10;
let $wait_condition=select count(*)=1 from information_schema.processlist
where state='User sleep' and
info='select * from information_schema.tables where 1=sleep(100000)';
--source include/wait_condition.inc
disable_query_log;
eval kill $ID;
enable_query_log;
disconnect conn1;
let $wait_timeout= 10;
let $wait_condition=select count(*)=0 from information_schema.processlist
where state='User sleep' and
info='select * from information_schema.tables where 1=sleep(100000)';
--source include/wait_condition.inc
connect (conn1, localhost, root,,);
connection conn1;
let $ID= `select connection_id()`;
send select * from information_schema.columns where 1=sleep(100000);
connection default;
let $wait_timeout= 10;
let $wait_condition=select count(*)=1 from information_schema.processlist
where state='User sleep' and
info='select * from information_schema.columns where 1=sleep(100000)';
--source include/wait_condition.inc
disable_query_log;
eval kill $ID;
enable_query_log;
disconnect conn1;
let $wait_timeout= 10;
let $wait_condition=select count(*)=0 from information_schema.processlist
where state='User sleep' and
info='select * from information_schema.columns where 1=sleep(100000)';
--source include/wait_condition.inc
--echo End of 5.1 tests. --echo End of 5.1 tests.
...@@ -3722,6 +3722,7 @@ longlong Item_func_sleep::val_int() ...@@ -3722,6 +3722,7 @@ longlong Item_func_sleep::val_int()
pthread_cond_init(&cond, NULL); pthread_cond_init(&cond, NULL);
pthread_mutex_lock(&LOCK_user_locks); pthread_mutex_lock(&LOCK_user_locks);
thd_proc_info(thd, "User sleep");
thd->mysys_var->current_mutex= &LOCK_user_locks; thd->mysys_var->current_mutex= &LOCK_user_locks;
thd->mysys_var->current_cond= &cond; thd->mysys_var->current_cond= &cond;
...@@ -3733,6 +3734,7 @@ longlong Item_func_sleep::val_int() ...@@ -3733,6 +3734,7 @@ longlong Item_func_sleep::val_int()
break; break;
error= 0; error= 0;
} }
thd_proc_info(thd, 0);
pthread_mutex_unlock(&LOCK_user_locks); pthread_mutex_unlock(&LOCK_user_locks);
pthread_mutex_lock(&thd->mysys_var->mutex); pthread_mutex_lock(&thd->mysys_var->mutex);
thd->mysys_var->current_mutex= 0; thd->mysys_var->current_mutex= 0;
......
...@@ -3430,7 +3430,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, ...@@ -3430,7 +3430,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
/* /*
there was errors during opening tables there was errors during opening tables
*/ */
const char *error= thd->main_da.message(); const char *error= thd->is_error() ? thd->main_da.message() : "";
if (tables->view) if (tables->view)
table->field[3]->store(STRING_WITH_LEN("VIEW"), cs); table->field[3]->store(STRING_WITH_LEN("VIEW"), cs);
else if (tables->schema_table) else if (tables->schema_table)
...@@ -3631,6 +3631,7 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables, ...@@ -3631,6 +3631,7 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
I.e. we are in SELECT FROM INFORMATION_SCHEMA.COLUMS I.e. we are in SELECT FROM INFORMATION_SCHEMA.COLUMS
rather than in SHOW COLUMNS rather than in SHOW COLUMNS
*/ */
if (thd->is_error())
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
thd->main_da.sql_errno(), thd->main_da.message()); thd->main_da.sql_errno(), thd->main_da.message());
thd->clear_error(); thd->clear_error();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment