diff options
| author | unknown <pem@mysql.comhem.se> | 2003-12-09 19:05:41 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-12-09 19:05:41 +0100 |
| commit | 4c8f7bd861ec7f92822d8edb489d67977aa4f4c6 (patch) | |
| tree | 7ea7e1f38539ecdf54cf1818675022e67ec8496d | |
| parent | aaac51ea982b0502b9b51159afd86eebb7907b47 (diff) | |
| download | mariadb-git-4c8f7bd861ec7f92822d8edb489d67977aa4f4c6.tar.gz | |
Post-merge fixes.
| -rw-r--r-- | mysql-test/r/mysqldump.result | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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; |