diff options
| author | guilhem@gbichot3.local <> | 2007-03-22 16:00:47 +0100 |
|---|---|---|
| committer | guilhem@gbichot3.local <> | 2007-03-22 16:00:47 +0100 |
| commit | 6a4dbc332243ff01e940bfa8fa3b96e775325c4b (patch) | |
| tree | 20114034d61c933b3e155630e00aa04bca4d81fb /sql/sql_derived.cc | |
| parent | f0936e94415e82104304634c88446fa10df2b1ca (diff) | |
| parent | f0a95a4e20e095ae27f3003bbcdc8d3eb2aa01d2 (diff) | |
| download | mariadb-git-6a4dbc332243ff01e940bfa8fa3b96e775325c4b.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
will fix by hand
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 5712fbceac8..89bd7958c86 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -179,7 +179,7 @@ exit: orig_table_list->table_name= table->s->table_name.str; orig_table_list->table_name_length= table->s->table_name.length; table->derived_select_number= first_select->select_number; - table->s->tmp_table= TMP_TABLE; + table->s->tmp_table= NON_TRANSACTIONAL_TMP_TABLE; #ifndef NO_EMBEDDED_ACCESS_CHECKS if (orig_table_list->referencing_view) table->grant= orig_table_list->grant; |