From 2db684572ea716de462bf8d79f398dfcc130a8ff Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Tue, 2 Feb 2010 11:17:58 -0200
Subject: Fix for valgrind warning: check whether pointer was initialized.

storage/myisammrg/ha_myisammrg.cc:
  myisam pointer is not relevant if a error was raised.
---
 storage/myisammrg/ha_myisammrg.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'storage/myisammrg')

diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index e265dac2c82..8af776f5c5e 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -380,7 +380,7 @@ static MI_INFO *myisammrg_attach_children_callback(void *callback_param)
     my_errno= HA_ERR_WRONG_MRG_TABLE_DEF;
   }
   DBUG_PRINT("myrg", ("MyISAM handle: 0x%lx  my_errno: %d",
-                      (long) myisam, my_errno));
+                      my_errno ? NULL : (long) myisam, my_errno));
 
  err:
   DBUG_RETURN(my_errno ? NULL : myisam);
-- 
cgit v1.2.1