diff options
| author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2007-03-29 12:25:28 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2007-03-29 12:25:28 +0200 |
| commit | e420488ee6e3b38a0524b391a96638af7edc06ce (patch) | |
| tree | 1e6d9e2f685ac0edc110cb4b215d1c1d82f25289 /sql/sql_base.cc | |
| parent | 8e1d4f725663d60b7efa7d5ec4271cbd924cad80 (diff) | |
| parent | ee0475bf5d5b9256d599aa6b9dcc641d4857d301 (diff) | |
| download | mariadb-git-e420488ee6e3b38a0524b391a96638af7edc06ce.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_class.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 97cb2d00689..57d99d4e461 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= |