From f0a95a4e20e095ae27f3003bbcdc8d3eb2aa01d2 Mon Sep 17 00:00:00 2001
From: "guilhem@gbichot3.local" <>
Date: Thu, 22 Mar 2007 15:07:32 +0100
Subject: - renaming TMP_TABLE to NON_TRANSACTIONAL_TMP_TABLE because this is
 what it actually means (Monty approved the renaming) - correcting description
 of transaction_alloc command-line options (our manual is correct) - fix for a
 failure of rpl_trigger.

---
 sql/sql_base.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_base.cc')

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 77bb1d9642b..e8cb3ae675d 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=
-- 
cgit v1.2.1