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

   1 $NetBSD$
   2
   3 --- sql/sql_planner.cc.orig     2013-05-05 20:56:04.000000000 +0000
   4 +++ sql/sql_planner.cc
   5 @@ -193,7 +193,7 @@ public:
   6      }
   7    }
   8
   9 -  bool have_a_case() { return test(handled_sj_equalities); }
  10 +  bool have_a_case() { return my_test(handled_sj_equalities); }
  11
  12    /**
  13      Check if an index can be used for LooseScan, part 1
  14 @@ -571,7 +571,7 @@ void Optimize_table_order::best_access_p
  15        }
  16        else
  17        {
  18 -        found_constraint= test(found_part);
  19 +        found_constraint= my_test(found_part);
  20          loose_scan_opt.check_ref_access_part1(s, key, start_key, found_part);
  21
  22          /* Check if we found full key */
  23 @@ -711,7 +711,7 @@ void Optimize_table_order::best_access_p
  24              */
  25              if (table->quick_keys.is_set(key) && !found_ref &&          //(C1)
  26                  table->quick_key_parts[key] == max_key_part &&          //(C2)
  27 -                table->quick_n_ranges[key] == 1+test(ref_or_null_part)) //(C3)
  28 +                table->quick_n_ranges[key] == 1+my_test(ref_or_null_part)) //(C3)
  29              {
  30                tmp= records= (double) table->quick_rows[key];
  31              }
  32 @@ -813,7 +813,7 @@ void Optimize_table_order::best_access_p
  33                    table->quick_key_parts[key] <= max_key_part &&
  34                    const_part &
  35                      ((key_part_map)1 << table->quick_key_parts[key]) &&
  36 -                  table->quick_n_ranges[key] == 1 + test(ref_or_null_part &
  37 +                  table->quick_n_ranges[key] == 1 + my_test(ref_or_null_part &
  38                                                           const_part) &&
  39                    records > (double) table->quick_rows[key])
  40                {
  41 @@ -1037,7 +1037,7 @@ void Optimize_table_order::best_access_p
  42        best_key= 0;
  43        /* range/index_merge/ALL/index access method are "independent", so: */
  44        best_ref_depends_map= 0;
  45 -      best_uses_jbuf= test(!disable_jbuf);
  46 +      best_uses_jbuf= my_test(!disable_jbuf);
  47      }
  48    }
  49
  50 @@ -1101,7 +1101,7 @@ bool Optimize_table_order::choose_table_
  51
  52    reset_nj_counters(join->join_list);
  53
  54 -  const bool straight_join= test(join->select_options & SELECT_STRAIGHT_JOIN);
  55 +  const bool straight_join= my_test(join->select_options & SELECT_STRAIGHT_JOIN);
  56    table_map join_tables;      ///< The tables involved in order selection
  57
  58    if (emb_sjm_nest)