databases/mysql56-client/patches/patch-storage_myisam_mi__create.c

   1 $NetBSD$
   2
   3 --- storage/myisam/mi_create.c.orig     2013-04-28 14:00:49.000000000 +0000
   4 +++ storage/myisam/mi_create.c
   5 @@ -134,7 +134,7 @@ int mi_create(const char *name,uint keys
   6         pack_reclength++;
   7          min_pack_length++;
   8          /* We must test for 257 as length includes pack-length */
   9 -        if (test(rec->length >= 257))
  10 +        if (my_test(rec->length >= 257))
  11         {
  12           long_varchar_count++;
  13           pack_reclength+= 2;                   /* May be packed on 3 bytes */
  14 @@ -193,7 +193,7 @@ int mi_create(const char *name,uint keys
  15    packed=(packed+7)/8;
  16    if (pack_reclength != INT_MAX32)
  17      pack_reclength+= reclength+packed +
  18 -      test(test_all_bits(options, HA_OPTION_CHECKSUM | HA_OPTION_PACK_RECORD));
  19 +      my_test(test_all_bits(options, HA_OPTION_CHECKSUM | HA_OPTION_PACK_RECORD));
  20    min_pack_length+=packed;
  21
  22    if (!ci->data_file_length && ci->max_rows)
  23 @@ -544,7 +544,7 @@ int mi_create(const char *name,uint keys
  24    share.base.records=ci->max_rows;
  25    share.base.reloc=  ci->reloc_rows;
  26    share.base.reclength=real_reclength;
  27 -  share.base.pack_reclength=reclength+ test(options & HA_OPTION_CHECKSUM);
  28 +  share.base.pack_reclength=reclength+ my_test(options & HA_OPTION_CHECKSUM);
  29    share.base.max_pack_length=pack_reclength;
  30    share.base.min_pack_length=min_pack_length;
  31    share.base.pack_bits=packed;