diff options
| author | unknown <guilhem@gbichot3.local> | 2007-03-22 16:00:47 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2007-03-22 16:00:47 +0100 |
| commit | c4e4bc323519d8e9ba1be8505c19d732f6ab8199 (patch) | |
| tree | 20114034d61c933b3e155630e00aa04bca4d81fb /sql/sql_derived.cc | |
| parent | 89bfca83c925631e3366bd1b2dae229d2b2b4c29 (diff) | |
| parent | 685d21b72f201a2eb16718e73c76e62ee708458d (diff) | |
| download | mariadb-git-c4e4bc323519d8e9ba1be8505c19d732f6ab8199.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
mysql-test/t/rpl_misc_functions.test:
Auto merged
sql/lock.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
will fix by hand
sql/table.h:
merge from 5.0
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; |