diff options
| author | bell@sanja.is.com.ua <> | 2004-04-08 00:19:43 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-04-08 00:19:43 +0300 |
| commit | 56be6f3f9325f056b5343fc9a4a122f30e280d12 (patch) | |
| tree | 8623a46473c8c2cb769c792a41b7a28bae698da7 /sql/sql_select.cc | |
| parent | 3b6c3dd2f5b2416a02b0a878187e977d9bf1d044 (diff) | |
| parent | 5e37c41faee13cdc977842d253e6da0266766baf (diff) | |
| download | mariadb-git-56be6f3f9325f056b5343fc9a4a122f30e280d12.tar.gz | |
merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 86b1dcfb4ee..c634dd0ab0e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -434,7 +434,7 @@ JOIN::prepare(Item ***rref_pointer_array, goto err; } #endif - if (!procedure && result->prepare(fields_list, unit_arg)) + if (!procedure && result && result->prepare(fields_list, unit_arg)) goto err; /* purecov: inspected */ if (select_lex->olap == ROLLUP_TYPE && rollup_init()) |