databases/mysql56-client/patches/patch-sql_item__subselect.cc

   1 $NetBSD$
   2
   3 --- sql/item_subselect.cc.orig  2013-05-05 20:56:04.000000000 +0000
   4 +++ sql/item_subselect.cc
   5 @@ -3588,7 +3588,7 @@ bool subselect_hash_sj_engine::setup(Lis
   6                           /* TODO:
   7                              the NULL byte is taken into account in
   8                              key_parts[part_no].store_length, so instead of
   9 -                            cur_ref_buff + test(maybe_null), we could
  10 +                            cur_ref_buff + my_test(maybe_null), we could
  11                              use that information instead.
  12                           */
  13                           cur_ref_buff + (nullable ? 1 : 0),
  14 @@ -3697,7 +3697,7 @@ bool subselect_hash_sj_engine::exec()
  15        goto err; /* purecov: inspected */
  16
  17      materialize_engine->join->exec();
  18 -    if ((res= test(materialize_engine->join->error || thd->is_fatal_error)))
  19 +    if ((res= my_test(materialize_engine->join->error || thd->is_fatal_error)))
  20        goto err;
  21
  22      /*