diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-05-28 22:43:10 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-05-28 22:43:10 +0300 |
| commit | 56f154165c9ea67a385f194d6c5709b673abb927 (patch) | |
| tree | 33e3a08d824e5e8b3ce14a6afebc19a32df09d29 /sql/sql_derived.cc | |
| parent | 3d9cd36f47649a5693695576d3e6fb9dfd6648d9 (diff) | |
| parent | 3cdaf67e9c0a5f35dc9c934f2fe3b09c561d8c49 (diff) | |
| download | mariadb-git-56f154165c9ea67a385f194d6c5709b673abb927.tar.gz | |
merging
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 4a64c30e7e5..fb40a85fd91 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -75,11 +75,11 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t) } bzero((char*) &tmp_table_param,sizeof(tmp_table_param)); tmp_table_param.field_count=item_list.elements; - if (!(table= create_tmp_table(thd, &tmp_table_param, sl->item_list, - (ORDER*) 0, 0, 1, 0, - (sl->options | thd->options | - TMP_TABLE_ALL_COLUMNS), - unit))) + if (!(table=create_tmp_table(thd, &tmp_table_param, item_list, + (ORDER*) 0, 0, 1, 0, + (sl->options | thd->options | + TMP_TABLE_ALL_COLUMNS), + unit))) { res=-1; goto exit; |