diff options
| author | konstantin@mysql.com <> | 2006-02-02 16:57:34 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2006-02-02 16:57:34 +0300 |
| commit | 92b41ba92a022e86127481f2f4a90849feb93114 (patch) | |
| tree | 8b45ee033b876bd5d51ce4afe7627ae87815b79c /sql/sql_help.cc | |
| parent | 065f8066d5de10cf998b02d0e02216f61d87e9db (diff) | |
| parent | 87f685edef5bd97ab8099d0ae6dcf2fa3ddd871b (diff) | |
| download | mariadb-git-92b41ba92a022e86127481f2f4a90849feb93114.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 0715aeeaa5b..ea9bca57cc6 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -567,7 +567,7 @@ SQL_SELECT *prepare_simple_select(THD *thd, Item *cond, SQL_SELECT *res= make_select(table, 0, 0, cond, 0, error); if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR)) || - (res->quick && res->quick->reset())) + (res && res->quick && res->quick->reset())) { delete res; res=0; |