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

   1 $NetBSD$
   2
   3 --- sql/sql_parse.cc.orig       2013-05-05 20:56:04.000000000 +0000
   4 +++ sql/sql_parse.cc
   5 @@ -6427,7 +6427,7 @@ TABLE_LIST *st_select_lex::add_table_to_
   6    if (!table)
   7      DBUG_RETURN(0);                            // End of memory
   8    alias_str= alias ? alias->str : table->table.str;
   9 -  if (!test(table_options & TL_OPTION_ALIAS))
  10 +  if (!my_test(table_options & TL_OPTION_ALIAS))
  11    {
  12      enum_ident_name_check ident_check_status=
  13        check_table_name(table->table.str, table->table.length, FALSE);
  14 @@ -6477,10 +6477,10 @@ TABLE_LIST *st_select_lex::add_table_to_
  15    ptr->table_name=table->table.str;
  16    ptr->table_name_length=table->table.length;
  17    ptr->lock_type=   lock_type;
  18 -  ptr->updating=    test(table_options & TL_OPTION_UPDATING);
  19 +  ptr->updating=    my_test(table_options & TL_OPTION_UPDATING);
  20    /* TODO: remove TL_OPTION_FORCE_INDEX as it looks like it's not used */
  21 -  ptr->force_index= test(table_options & TL_OPTION_FORCE_INDEX);
  22 -  ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES);
  23 +  ptr->force_index= my_test(table_options & TL_OPTION_FORCE_INDEX);
  24 +  ptr->ignore_leaves= my_test(table_options & TL_OPTION_IGNORE_LEAVES);
  25    ptr->derived=            table->sel;
  26    if (!ptr->derived && is_infoschema_db(ptr->db, ptr->db_length))
  27    {
  28 @@ -6571,7 +6571,7 @@ TABLE_LIST *st_select_lex::add_table_to_
  29    lex->add_to_query_tables(ptr);
  30
  31    // Pure table aliases do not need to be locked:
  32 -  if (!test(table_options & TL_OPTION_ALIAS))
  33 +  if (!my_test(table_options & TL_OPTION_ALIAS))
  34    {
  35      ptr->mdl_request.init(MDL_key::TABLE, ptr->db, ptr->table_name, mdl_type,
  36                            MDL_TRANSACTION);