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

   1 $NetBSD$
   2
   3 --- sql/sql_union.cc.orig       2013-05-05 20:56:04.000000000 +0000
   4 +++ sql/sql_union.cc
   5 @@ -271,7 +271,7 @@ bool st_select_lex_unit::prepare(THD *th
   6    bool is_union_select;
   7    DBUG_ENTER("st_select_lex_unit::prepare");
   8
   9 -  describe= test(additional_options & SELECT_DESCRIBE);
  10 +  describe= my_test(additional_options & SELECT_DESCRIBE);
  11
  12    /*
  13      result object should be reassigned even if preparing already done for
  14 @@ -462,7 +462,7 @@ bool st_select_lex_unit::prepare(THD *th
  15      if (global_parameters->ftfunc_list->elements)
  16        create_options= create_options | TMP_TABLE_FORCE_MYISAM;
  17
  18 -    if (union_result->create_result_table(thd, &types, test(union_distinct),
  19 +    if (union_result->create_result_table(thd, &types, my_test(union_distinct),
  20                                            create_options, "", FALSE, TRUE))
  21        goto err;
  22      memset(&result_table_list, 0, sizeof(result_table_list));