diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:21:17 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:21:17 +0300 |
| commit | 1ab31553cafbb5e7e090c638f5dbc6647ee2d111 (patch) | |
| tree | 33c92e57a94a700ac7dbcca5e9c0ff9181f1e6f0 /storage/myisammrg | |
| parent | ab61c15efdf8da4152a98ee218b537ad6da625a9 (diff) | |
| parent | cf55cf596e33bb5287bb8336972dbe3ae35fdad4 (diff) | |
| download | mariadb-git-1ab31553cafbb5e7e090c638f5dbc6647ee2d111.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/t/bug46080.test
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 49ea9626b21..7d9cac775a8 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -381,7 +381,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); |