diff options
| author | monty@mysql.com <> | 2005-08-12 13:54:42 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-08-12 13:54:42 +0300 |
| commit | 4c0d23e156d1148243ae8439c1115280e78ad04c (patch) | |
| tree | 70e0735a5a37bab3dae8e75c038e4c86703fc643 /sql/sql_derived.cc | |
| parent | e80252e53cfd040dc09e6160d4c2d8ed9c1bbe54 (diff) | |
| download | mariadb-git-4c0d23e156d1148243ae8439c1115280e78ad04c.tar.gz | |
Fixes during review of new pushed code
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index afcf7dbd93f..fc9d15e94c4 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -142,8 +142,7 @@ int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) unit->types, (ORDER*) 0, FALSE, 1, (first_select->options | thd->options | - TMP_TABLE_ALL_COLUMNS) & - ~TMP_TABLE_FORCE_MYISAM, + TMP_TABLE_ALL_COLUMNS), HA_POS_ERROR, orig_table_list->alias))) { |