database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge from mysql-trunk-merge.

Browse Source 
Conflicts:
  - sql/ha_partition.cc
  - sql/sql_partition.cc

The following tests started to fail:
  - main.partition_innodb (a crash)
This commit is contained in:
Alexander Nozdrin
2010-01-28 00:24:35 +03:00
parent ee7b8b7761 8c6d6c0c6c
commit cf97ed0c1b
7 changed files with 158 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -7001,7 +7001,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
/*
If the query was killed then this function must fail.
*/
return result || thd->killed;
return result || (thd ? thd->killed : 0);
}