summaryrefslogtreecommitdiff
path: root/mysql-test/t/kill.test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-08-18 03:12:42 +0300
committerunknown <monty@mysql.com>2005-08-18 03:12:42 +0300
commit44086a625ba427522c7984f71a94f61d22122f3b (patch)
tree539169e9b0ec85fd466c859729fb9630778435b8 /mysql-test/t/kill.test
parent219c84faba28171cc04608f826703f5c031d70bc (diff)
downloadmariadb-git-44086a625ba427522c7984f71a94f61d22122f3b.tar.gz
Cleanups and optimization during review of new code
mysql-test/t/kill.test: Moved --disable_reconnect earlier to avoid race condition sql/sql_help.cc: Cleanup during review of new code (Moved variable definitions first in function sql/sql_insert.cc: Cleanup during review of new code sql/sql_lex.cc: Cleanup during review of new code sql/sql_parse.cc: Cleanup during review of new code Changed potential problem with previous_table_ref where it dependent that TABLE_LIST first element would be next_local Rearanged code in add_table_to_list() to remove extra if Combined 2 calls to calloc() to one sql/sql_view.cc: Remove extra indentation level Combined common 'on error' exit sql/sql_yacc.yy: Fixed comment style sql/table.cc: Cleanup during review of new code - Changed while() loops to for() loop (to make code more readable) - Removed not needed initialization of variables - Removed not needed 'else' cases - Removed trivial ASSERT's that was checked by previous code - Moved comment setting last in Natural_join_column::check_grants()
Diffstat (limited to 'mysql-test/t/kill.test')
-rw-r--r--mysql-test/t/kill.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 09ad3f59c10..3503d5fde1d 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -15,6 +15,7 @@ connection con1;
drop table if exists t1;
--enable_warnings
+--disable_reconnect
create table t1 (kill_id int);
insert into t1 values(connection_id());
@@ -25,7 +26,6 @@ kill @id;
connection con1;
---disable_reconnect
# this statement should fail
--error 2006,2013
select 1;