mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 04:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge from mysql-trunk-merge.

Browse source 
Conflicts:
  - include/my_no_pthread.h
  - mysql-test/r/sp-ucs2.result
  - sql/log.cc
  - sql/sql_acl.cc
  - sql/sql_yacc.yy
This commit is contained in:
Alexander Nozdrin 2009-12-16 21:02:21 +03:00
commit 5f0c09dd72
108 changed files with 3402 additions and 1155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_show.cc
View file

@ -641,7 +641,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
thd->push_internal_handler(&view_error_suppressor);
bool error= open_normal_and_derived_tables(thd, table_list, 0);
thd->pop_internal_handler();
if (error && thd->is_error())
if (error && (thd->killed || thd->is_error()))
DBUG_RETURN(TRUE);
}