Post-merge fixes.

2c3065c9 · pem@mysql.comhem.se · 24a2ae44 · 2c3065c9 · 2c3065c9
Commit 2c3065c9 authored Dec 09, 2003 by pem@mysql.comhem.se
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/mysqldump.result mysql-test/r/mysqldump.result +1 -1

sql/sql_parse.cc sql/sql_parse.cc +1 -1

No files found.
--- 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 */;

--- 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;