database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Post-merge fixes.

Browse Source
This commit is contained in:
unknown
2003-12-09 19:05:41 +01:00
parent aaac51ea98
commit 4c8f7bd861
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqldump.result
View File

@@ -68,7 +68,7 @@ INSERT INTO t1 VALUES (_ucs2 x'05D005D505DC05D9');
-- --
-- Host: localhost Database: test -- 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 */; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

2
sql/sql_parse.cc
View File

@@ -980,7 +980,7 @@ pthread_handler_decl(handle_one_connection,arg)
{ {
execute_init_command(thd, &sys_init_connect, &LOCK_sys_init_connect); execute_init_command(thd, &sys_init_connect, &LOCK_sys_init_connect);
if (thd->query_error) if (thd->query_error)
thd->killed= 1; thd->killed= THD::KILL_CONNECTION;
} }
thd->proc_info=0; thd->proc_info=0;