diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-09-03 21:33:19 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-09-03 21:33:19 +0300 |
| commit | a45f3414ded3f9150fb2dec885e1e25876731fa2 (patch) | |
| tree | 7c5197d5ff61c66c3277b53916289a60b77f60ca | |
| parent | 56259d57800f2bc7997605446f30bdb57f14d1d8 (diff) | |
| parent | 72b06b6f7b542045bcb30e3fc8d1980300b45767 (diff) | |
| download | mariadb-git-a45f3414ded3f9150fb2dec885e1e25876731fa2.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
sql/sql_select.cc:
Auto merged
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d94661a9d64..d36384faca1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -639,8 +639,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, DBUG_PRINT("info",("Creating tmp table")); thd->proc_info="Creating tmp table"; - join.tmp_table_param.hidden_field_count=(all_fields.elements- - fields.elements); + join.tmp_table_param.hidden_field_count= + (all_fields.elements > fields.elements) ? (all_fields.elements- fields.elements) : 0; if (!(tmp_table = create_tmp_table(thd,&join.tmp_table_param,all_fields, ((!simple_group && !procedure && |