summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-02-02 11:17:58 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-02-02 11:17:58 -0200
commit2db684572ea716de462bf8d79f398dfcc130a8ff (patch)
tree51c9ddd83b57f1dfdedba4ddeb7229805281c93d /storage/myisammrg
parent1dafac6f35b23757cafe0ac1ef9f6b4edb28947d (diff)
downloadmariadb-git-2db684572ea716de462bf8d79f398dfcc130a8ff.tar.gz
Fix for valgrind warning: check whether pointer was initialized.
storage/myisammrg/ha_myisammrg.cc: myisam pointer is not relevant if a error was raised.
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc2
1 files changed, 1 insertions, 1 deletions
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);