diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:05:04 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:05:04 +0200 |
| commit | b0b315dce3d961e5b29830dfafdff6bc4e58aaa0 (patch) | |
| tree | 7762c42e75102f122a8c9f5423ed0b676d5430a4 /sql/sql_derived.cc | |
| parent | a821703912e84b6be1f0a686f27e1c81a0040ff8 (diff) | |
| download | mariadb-git-b0b315dce3d961e5b29830dfafdff6bc4e58aaa0.tar.gz | |
After merge fixes
Don't create temporary objects with no table name
myisam/mi_open.c:
After merge fix
mysql-test/r/analyse.result:
After merge fix
mysql-test/r/backup.result:
After merge fix
mysql-test/r/create.result:
After merge fix
mysql-test/r/delete.result:
After merge fix
mysql-test/r/func_like.result:
After merge fix
mysql-test/r/innodb.result:
After merge fix
mysql-test/r/rpl_loaddatalocal.result:
After merge fix
mysql-test/r/type_timestamp.result:
After merge fix
mysql-test/t/delete.test:
Change to not use table 't'
sql/sql_class.h:
Remove usage of thd when creating 'Table_ident'
Don't create temporary objects with no table name
sql/sql_derived.cc:
Indentation fix
sql/sql_select.cc:
After merge fix
Fixed wrong return -> DBUG_RETURN()
sql/sql_yacc.yy:
Remove usage of thd when creating 'Table_ident'
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index f2cddeead2f..ca761140955 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -167,11 +167,13 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, (TABLE_LIST*) select_cursor->table_list.first, select_cursor->with_wild, select_cursor->item_list, select_cursor->where, - select_cursor->order_list.elements+select_cursor->group_list.elements, + (select_cursor->order_list.elements+ + select_cursor->group_list.elements), (ORDER *) select_cursor->order_list.first, (ORDER *) select_cursor->group_list.first, select_cursor->having, (ORDER*) NULL, - select_cursor->options | thd->options | SELECT_NO_UNLOCK, + (select_cursor->options | thd->options | + SELECT_NO_UNLOCK), derived_result, unit, select_cursor, 1); if (!res) |