From 17a10cb40e0c17d8c93ba078da2b56fb3699f400 Mon Sep 17 00:00:00 2001 From: "istruewing@stella.local" <> Date: Mon, 10 Mar 2008 19:00:45 +0100 Subject: [PATCH] Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1 Post-pushbuild fixes. Added purecov comments. --- storage/myisam/ha_myisam.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 4486d317ae0..9c04a5a3523 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -410,10 +410,10 @@ int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo, { if ((t1_keysegs_j__type == HA_KEYTYPE_VARTEXT2) && (t2_keysegs[j].type == HA_KEYTYPE_VARTEXT1)) - t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1; + t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1; /* purecov: tested */ else if ((t1_keysegs_j__type == HA_KEYTYPE_VARBINARY2) && (t2_keysegs[j].type == HA_KEYTYPE_VARBINARY1)) - t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; + t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; /* purecov: inspected */ } if (t1_keysegs_j__type != t2_keysegs[j].type ||