Fix for valgrind warning: check whether pointer was initialized.

Davi Arnaut · Davi Arnaut · commit 1a6ab2267fa7 · 2010-02-02T11:17:58.000-02:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ static MI_INFO myisammrg_attach_children_callback(void callback_param)`
`380`	`380`	`my_errno= HA_ERR_WRONG_MRG_TABLE_DEF;`
`381`	`381`	`}`
`382`	`382`	`DBUG_PRINT("myrg", ("MyISAM handle: 0x%lx my_errno: %d",`
`383`		`- (long) myisam, my_errno));`
	`383`	`+ my_errno ? NULL : (long) myisam, my_errno));`
`384`	`384`
`385`	`385`	`err:`
`386`	`386`	`DBUG_RETURN(my_errno ? NULL : myisam);`