From 315acca125bdfc763ed4c93a8699c8bab8ee650a Mon Sep 17 00:00:00 2001
From: "monty@mysql.com/narttu.mysql.fi" <>
Date: Mon, 1 Oct 2007 15:32:07 +0300
Subject: Removed extra spaces Added extra debug

---
 sql/handler.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index 2cb3c5aa348..d59ef4d037f 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2502,8 +2502,9 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
 int ha_enable_transaction(THD *thd, bool on)
 {
   int error=0;
-
   DBUG_ENTER("ha_enable_transaction");
+  DBUG_PRINT("enter", ("on: %d", (int) on));
+
   thd->transaction.on= on;
   if (on)
   {
-- 
cgit v1.2.1


From 7887babe69412b6f33f6cb782f468e9b58695fb9 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com/narttu.mysql.fi" <>
Date: Thu, 11 Oct 2007 18:07:40 +0300
Subject: Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to
 5.1 - Reserver namespace and place in frm for TABLE_CHECKSUM and
 PAGE_CHECKSUM create options - Added syncing of directory when creating .frm
 files - Portability fixes - Added missing cast that could cause bugs - Code
 cleanups - Made some bit functions inline - Moved things out of myisam.h to
 my_handler.h to make them more accessable - Renamed some myisam variables and
 defines to make them more globaly usable (as they are used outside of MyISAM)
 - Fixed bugs in error conditions - Use compiler time asserts instead of run
 time - Fixed indentation HA_EXTRA_PREPARE_FOR_DELETE ->
 HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong (Added a define for old
 value to ensure we don't break any old code) Added
 HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP
 signal which is wrong) - Initialize error messages early to get better errors
 when mysqld or an engine fails to start - Fix windows bug that
 query_performance_frequency was not initialized if registry code failed -
 thread_stack -> my_thread_stack_size

---
 sql/handler.cc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index 9e47baadd4a..5b121ac258a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -290,7 +290,8 @@ handler *get_ha_partition(partition_info *part_info)
     0           OK
     != 0        Error
 */
-static int ha_init_errors(void)
+
+int ha_init_errors(void)
 {
 #define SETMSG(nr, msg) errmsgs[(nr) - HA_ERR_FIRST]= (msg)
   const char    **errmsgs;
@@ -505,9 +506,6 @@ int ha_init()
   int error= 0;
   DBUG_ENTER("ha_init");
 
-  if (ha_init_errors())
-    DBUG_RETURN(1);
-
   DBUG_ASSERT(total_ha < MAX_HA);
   /*
     Check if there is a transaction-capable storage engine besides the
@@ -2505,8 +2503,7 @@ int ha_enable_transaction(THD *thd, bool on)
   DBUG_ENTER("ha_enable_transaction");
   DBUG_PRINT("enter", ("on: %d", (int) on));
 
-  thd->transaction.on= on;
-  if (on)
+  if ((thd->transaction.on= on))
   {
     /*
       Now all storage engines should have transaction handling enabled.
-- 
cgit v1.2.1