diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index f5d98143f9e..8efda4b110c 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -68,7 +68,7 @@ INSERT INTO t1 VALUES (_ucs2 x'05D005D505DC05D9'); -- -- Host: localhost Database: test -- ------------------------------------------------------ --- Server version 4.1.2-alpha-debug-log +-- Server version 5.0.0-alpha-debug-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index fa94296cb0a..c8d5ebe0743 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -980,7 +980,7 @@ pthread_handler_decl(handle_one_connection,arg) { execute_init_command(thd, &sys_init_connect, &LOCK_sys_init_connect); if (thd->query_error) - thd->killed= 1; + thd->killed= THD::KILL_CONNECTION; } thd->proc_info=0;