diff options
| author | dlenev@mysql.com <> | 2004-11-24 13:04:14 +0300 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2004-11-24 13:04:14 +0300 |
| commit | ab432257e4cca6f2997a607ebdc853f3b3605d3e (patch) | |
| tree | 172b68543c161b9fb3de3a7b78c88a821f0a566e /sql | |
| parent | d201074611193e42a5d36e6ba5bae908e373b5bc (diff) | |
| parent | f71cd86ff1b3c135b529069b4b9c57283d673882 (diff) | |
| download | mariadb-git-ab432257e4cca6f2997a607ebdc853f3b3605d3e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg5888
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 7fd9bf48b0b..5e42fc0ee30 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -277,8 +277,6 @@ class JOIN :public Sql_alloc hidden_group_fields= 0; /*safety*/ buffer_result= test(select_options & OPTION_BUFFER_RESULT) && !test(select_options & OPTION_FOUND_ROWS); - all_fields= fields_arg; - fields_list= fields_arg; error= 0; select= 0; return_tab= 0; @@ -288,6 +286,7 @@ class JOIN :public Sql_alloc optimized= 0; cond_equal= 0; + all_fields= fields_arg; fields_list= fields_arg; bzero((char*) &keyuse,sizeof(keyuse)); tmp_table_param.copy_field=0; |