diff options
| author | bell@sanja.is.com.ua <> | 2003-12-09 22:56:31 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-12-09 22:56:31 +0200 |
| commit | 4ddefbb081cb8ce20c415d5fb59ecc9a031e609a (patch) | |
| tree | 02d74f08c6bd032c697f96739c4bd32217257d52 /sql | |
| parent | e632fa7d4cc5f7ec4edea9e98230d7f4628362b2 (diff) | |
| parent | 0dea4148c821d5d7fe9ad2eb15e50120fe6c44c2 (diff) | |
| download | mariadb-git-4ddefbb081cb8ce20c415d5fb59ecc9a031e609a.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 07f2f1eaf67..4bbeaca8a79 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2447,6 +2447,7 @@ QUICK_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, TABLE_REF *ref) QUICK_SELECT *quick=new QUICK_SELECT(thd, table, ref->key, 1); KEY *key_info = &table->key_info[ref->key]; KEY_PART *key_part; + QUICK_RANGE *range; uint part; if (!quick) @@ -2458,8 +2459,7 @@ QUICK_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, TABLE_REF *ref) return quick; // empty range } - QUICK_RANGE *range= new QUICK_RANGE(); - if (!range) + if (!(range= new QUICK_RANGE())) goto err; // out of memory range->min_key=range->max_key=(char*) ref->key_buff; |