diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-03-31 00:15:20 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-03-31 00:15:20 +0200 |
| commit | f47c23288a1cf6b5b43363542de72276eaf6a923 (patch) | |
| tree | 44c65e78263fa346e74dd5a121df765f6e7dccc7 /sql/sql_base.cc | |
| parent | fe8c67effa5b11ccb7ed668c6cfcec39f756281d (diff) | |
| parent | 905bc913fd9dc99640764e635dc82d67be46474a (diff) | |
| download | mariadb-git-f47c23288a1cf6b5b43363542de72276eaf6a923.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4a09a442c0d..b67fc73ba7b 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2950,7 +2950,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db, share= tmp_table->s; tmp_table->reginfo.lock_type=TL_WRITE; // Simulate locked share->tmp_table= (tmp_table->file->has_transactions() ? - TRANSACTIONAL_TMP_TABLE : TMP_TABLE); + TRANSACTIONAL_TMP_TABLE : NON_TRANSACTIONAL_TMP_TABLE); share->table_cache_key= (char*) (tmp_table+1); share->db= share->table_cache_key; share->key_length= (uint) (strmov(((char*) (share->table_name= |