diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-28 00:24:35 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-28 00:24:35 +0300 |
| commit | 0531110e23affde489f64b950e9c1318ff991f58 (patch) | |
| tree | bad36dcce2113d8e95564e7190843c67fed8086c /sql/sql_parse.cc | |
| parent | f6202ca6e25c8138d81fd37e23d3ce8509770cf9 (diff) | |
| parent | c26551e15dfba78c3a5111c4c2016202c460a9b4 (diff) | |
| download | mariadb-git-0531110e23affde489f64b950e9c1318ff991f58.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/ha_partition.cc
- sql/sql_partition.cc
The following tests started to fail:
- main.partition_innodb (a crash)
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 287abddb0f1..be722095a9c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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); } |