diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-07-27 18:32:42 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-07-27 18:32:42 +0400 |
| commit | 2abe7b9d4ee96919cc0504be3805c8712a46a532 (patch) | |
| tree | f5b4dd56c20ccff8f87fcf2ff244d4be368ac972 /storage/myisammrg | |
| parent | 6d059673f7dc1dbff5e154b0ca6d1ef2f0fa3cc3 (diff) | |
| parent | c6a34a99616c749c1d4874c9e7f7424fd2765de6 (diff) | |
| download | mariadb-git-2abe7b9d4ee96919cc0504be3805c8712a46a532.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime.
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index f41629ff882..f62aff4e383 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -642,7 +642,7 @@ extern "C" 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", - my_errno ? NULL : (long) myisam, my_errno)); + my_errno ? 0L : (long) myisam, my_errno)); end: DBUG_RETURN(myisam); |