diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-01-19 12:18:48 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-01-19 12:18:48 +0100 |
| commit | 8c6d6c0c6caaecfce24ae031ffca1f0031ce798d (patch) | |
| tree | 07f278807b69db0038942ff2df4c57c2eaeefcc9 /sql/sql_parse.cc | |
| parent | b60d59b958e276b966d44cb8cfd38fe9547da586 (diff) | |
| parent | eab2be0aeed0459c505578a716f8b0ae88a8f365 (diff) | |
| download | mariadb-git-8c6d6c0c6caaecfce24ae031ffca1f0031ce798d.tar.gz | |
merge
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 f0fb58e9c3e..3c404a984bf 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6962,7 +6962,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); } |