diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-28 03:24:06 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-28 03:24:06 -0700 |
| commit | 69f2934891ef0d94fd0fe321b4a5ee358e55950a (patch) | |
| tree | 7c19b7ee880c5bae589738eb60930c48b29550a5 /sql/sql_select.cc | |
| parent | 27478af9d562f8c0269004344da0a52be0bd4359 (diff) | |
| parent | 67abd491a1d5c631b0e72ea89941fafd9ac2fa34 (diff) | |
| download | mariadb-git-69f2934891ef0d94fd0fe321b4a5ee358e55950a.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 8a0a647665e..044dc60e4b6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8725,7 +8725,7 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param, { Item *pos; List_iterator_fast<Item> li(all_fields); - Copy_field *copy; + Copy_field *copy= NULL; res_selected_fields.empty(); res_all_fields.empty(); List_iterator_fast<Item> itr(res_all_fields); @@ -8733,7 +8733,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param, uint i, border= all_fields.elements - elements; DBUG_ENTER("setup_copy_fields"); - if (!(copy=param->copy_field= new Copy_field[param->field_count])) + if (param->field_count && + !(copy=param->copy_field= new Copy_field[param->field_count])) goto err2; param->copy_funcs.empty(); |