Commit b138b55d authored by unknown's avatar unknown
Browse files

Merge mysqldev@production:my/mysql-5.0-release 

into  mysql.com:/usr/local/mysql/tmp-5.0


include/my_global.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
parents 949ad5b4 4a6a237f

server-tools/instance-manager/mysqlmanager.vcproj

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib"

				OutputFile="$(OutDir)/mysqlmanager.exe"

				OutputFile="../../client_debug/mysqlmanager.exe"

				LinkIncremental="2"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="$(OutDir)/mysqlmanager.pdb"
@@ -82,7 +82,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib"

				OutputFile="$(OutDir)/mysqlmanager.exe"

				OutputFile="../../client_release/mysqlmanager.exe"

				LinkIncremental="1"

				GenerateDebugInformation="TRUE"

				SubSystem="1"

sql/item.cc

+29 −17
Original line number Diff line number Diff line
@@ -1315,35 +1315,37 @@ void my_coll_agg_error(DTCollation &c1, DTCollation &c2, DTCollation &c3, 




static

void my_coll_agg_error(Item** args, uint count, const char *fname)

void my_coll_agg_error(Item** args, uint count, const char *fname,

                       int item_sep)

{

  if (count == 2)

    my_coll_agg_error(args[0]->collation, args[1]->collation, fname);

    my_coll_agg_error(args[0]->collation, args[item_sep]->collation, fname);

  else if (count == 3)

    my_coll_agg_error(args[0]->collation, args[1]->collation,

                      args[2]->collation, fname);

    my_coll_agg_error(args[0]->collation, args[item_sep]->collation,

                      args[2*item_sep]->collation, fname);

  else

    my_error(ER_CANT_AGGREGATE_NCOLLATIONS,MYF(0),fname);

}





bool agg_item_collations(DTCollation &c, const char *fname,

                         Item **av, uint count, uint flags)

                         Item **av, uint count, uint flags, int item_sep)

{

  uint i;

  Item **arg;

  c.set(av[0]->collation);

  for (i= 1; i < count; i++)

  for (i= 1, arg= &av[item_sep]; i < count; i++, arg++)

  {

    if (c.aggregate(av[i]->collation, flags))

    if (c.aggregate((*arg)->collation, flags))

    {

      my_coll_agg_error(av, count, fname);

      my_coll_agg_error(av, count, fname, item_sep);

      return TRUE;

    }

  }

  if ((flags & MY_COLL_DISALLOW_NONE) &&

      c.derivation == DERIVATION_NONE)

  {

    my_coll_agg_error(av, count, fname);

    my_coll_agg_error(av, count, fname, item_sep);

    return TRUE;

  }

  return FALSE;
@@ -1354,7 +1356,7 @@ bool agg_item_collations_for_comparison(DTCollation &c, const char *fname, 
                                        Item **av, uint count, uint flags)

{

  return (agg_item_collations(c, fname, av, count,

                              flags | MY_COLL_DISALLOW_NONE));

                              flags | MY_COLL_DISALLOW_NONE, 1));

}
@@ -1377,13 +1379,22 @@ bool agg_item_collations_for_comparison(DTCollation &c, const char *fname, 
  For functions with more than two arguments:



    collect(A,B,C) ::= collect(collect(A,B),C)



  Since this function calls THD::change_item_tree() on the passed Item **

  pointers, it is necessary to pass the original Item **'s, not copies.

  Otherwise their values will not be properly restored (see BUG#20769).

  If the items are not consecutive (eg. args[2] and args[5]), use the

  item_sep argument, ie.



    agg_item_charsets(coll, fname, &args[2], 2, flags, 3)



*/



bool agg_item_charsets(DTCollation &coll, const char *fname,

                       Item **args, uint nargs, uint flags)

                       Item **args, uint nargs, uint flags, int item_sep)

{

  Item **arg, **last, *safe_args[2];

  if (agg_item_collations(coll, fname, args, nargs, flags))

  Item **arg, *safe_args[2];

  if (agg_item_collations(coll, fname, args, nargs, flags, item_sep))

    return TRUE;



  /*
@@ -1396,19 +1407,20 @@ bool agg_item_charsets(DTCollation &coll, const char *fname, 
  if (nargs >=2 && nargs <= 3)

  {

    safe_args[0]= args[0];

    safe_args[1]= args[1];

    safe_args[1]= args[item_sep];

  }



  THD *thd= current_thd;

  Query_arena *arena, backup;

  bool res= FALSE;

  uint i;

  /*

    In case we're in statement prepare, create conversion item

    in its memory: it will be reused on each execute.

  */

  arena= thd->activate_stmt_arena_if_needed(&backup);



  for (arg= args, last= args + nargs; arg < last; arg++)

  for (i= 0, arg= args; i < nargs; i++, arg+= item_sep)

  {

    Item* conv;

    uint32 dummy_offset;
@@ -1423,9 +1435,9 @@ bool agg_item_charsets(DTCollation &coll, const char *fname, 
      {

        /* restore the original arguments for better error message */

        args[0]= safe_args[0];

        args[1]= safe_args[1];

        args[item_sep]= safe_args[1];

      }

      my_coll_agg_error(args, nargs, fname);

      my_coll_agg_error(args, nargs, fname, item_sep);

      res= TRUE;

      break; // we cannot return here, we need to restore "arena".

    }

sql/item.h

+3 −4
Original line number Diff line number Diff line
@@ -1075,12 +1075,11 @@ class Item_name_const : public Item 
};



bool agg_item_collations(DTCollation &c, const char *name,

                         Item **items, uint nitems, uint flags= 0);

                         Item **items, uint nitems, uint flags, int item_sep);

bool agg_item_collations_for_comparison(DTCollation &c, const char *name,

                                        Item **items, uint nitems,

                                        uint flags= 0);

                                        Item **items, uint nitems, uint flags);

bool agg_item_charsets(DTCollation &c, const char *name,

                       Item **items, uint nitems, uint flags= 0);

                       Item **items, uint nitems, uint flags, int item_sep);





class Item_num: public Item

sql/item_cmpfunc.cc

+10 −10
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ void Item_bool_func2::fix_length_and_dec() 
  DTCollation coll;

  if (args[0]->result_type() == STRING_RESULT &&

      args[1]->result_type() == STRING_RESULT &&

      agg_arg_charsets(coll, args, 2, MY_COLL_CMP_CONV))

      agg_arg_charsets(coll, args, 2, MY_COLL_CMP_CONV, 1))

    return;
@@ -1211,7 +1211,7 @@ void Item_func_between::fix_length_and_dec() 
  agg_cmp_type(thd, &cmp_type, args, 3);



  if (cmp_type == STRING_RESULT)

      agg_arg_charsets(cmp_collation, args, 3, MY_COLL_CMP_CONV);

      agg_arg_charsets(cmp_collation, args, 3, MY_COLL_CMP_CONV, 1);

}
@@ -1331,7 +1331,7 @@ Item_func_ifnull::fix_length_and_dec() 


  switch (hybrid_type) {

  case STRING_RESULT:

    agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV);

    agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1);

    break;

  case DECIMAL_RESULT:

  case REAL_RESULT:
@@ -1503,7 +1503,7 @@ Item_func_if::fix_length_and_dec() 
    agg_result_type(&cached_result_type, args+1, 2);

    if (cached_result_type == STRING_RESULT)

    {

      if (agg_arg_charsets(collation, args+1, 2, MY_COLL_ALLOW_CONV))

      if (agg_arg_charsets(collation, args+1, 2, MY_COLL_ALLOW_CONV, 1))

        return;

    }

    else
@@ -1584,7 +1584,7 @@ Item_func_nullif::fix_length_and_dec() 
    unsigned_flag= args[0]->unsigned_flag;

    cached_result_type= args[0]->result_type();

    if (cached_result_type == STRING_RESULT &&

        agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV))

        agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1))

      return;

  }

}
@@ -1876,7 +1876,7 @@ void Item_func_case::fix_length_and_dec() 
  

  agg_result_type(&cached_result_type, agg, nagg);

  if ((cached_result_type == STRING_RESULT) &&

      agg_arg_charsets(collation, agg, nagg, MY_COLL_ALLOW_CONV))

      agg_arg_charsets(collation, agg, nagg, MY_COLL_ALLOW_CONV, 1))

    return;
@@ -1892,7 +1892,7 @@ void Item_func_case::fix_length_and_dec() 
    nagg++;

    agg_cmp_type(thd, &cmp_type, agg, nagg);

    if ((cmp_type == STRING_RESULT) &&

        agg_arg_charsets(cmp_collation, agg, nagg, MY_COLL_CMP_CONV))

        agg_arg_charsets(cmp_collation, agg, nagg, MY_COLL_CMP_CONV, 1))

      return;

  }
@@ -2022,7 +2022,7 @@ void Item_func_coalesce::fix_length_and_dec() 
  case STRING_RESULT:

    count_only_length();

    decimals= NOT_FIXED_DEC;

    agg_arg_charsets(collation, args, arg_count, MY_COLL_ALLOW_CONV);

    agg_arg_charsets(collation, args, arg_count, MY_COLL_ALLOW_CONV, 1);

    break;

  case DECIMAL_RESULT:

    count_decimal_length();
@@ -2486,7 +2486,7 @@ void Item_func_in::fix_length_and_dec() 
  agg_cmp_type(thd, &cmp_type, args, arg_count);



  if (cmp_type == STRING_RESULT &&

      agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV))

      agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV, 1))

    return;



  for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)
@@ -3219,7 +3219,7 @@ Item_func_regex::fix_fields(THD *thd, Item **ref) 
  max_length= 1;

  decimals= 0;



  if (agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV))

  if (agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV, 1))

    return TRUE;



  used_tables_cache=args[0]->used_tables() | args[1]->used_tables();

sql/item_func.cc

+6 −5
Original line number Diff line number Diff line
@@ -2038,7 +2038,7 @@ void Item_func_min_max::fix_length_and_dec() 
    cmp_type=item_cmp_type(cmp_type,args[i]->result_type());

  }

  if (cmp_type == STRING_RESULT)

    agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV);

    agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1);

  else if ((cmp_type == DECIMAL_RESULT) || (cmp_type == INT_RESULT))

    max_length= my_decimal_precision_to_length(max_int_part+decimals, decimals,

                                            unsigned_flag);
@@ -2227,7 +2227,7 @@ longlong Item_func_coercibility::val_int() 
void Item_func_locate::fix_length_and_dec()

{

  maybe_null=0; max_length=11;

  agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV);

  agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV, 1);

}
@@ -2344,7 +2344,7 @@ void Item_func_field::fix_length_and_dec() 
  for (uint i=1; i < arg_count ; i++)

    cmp_type= item_cmp_type(cmp_type, args[i]->result_type());

  if (cmp_type == STRING_RESULT)

    agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV);

    agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV, 1);

}
@@ -2411,7 +2411,7 @@ void Item_func_find_in_set::fix_length_and_dec() 
      }

    }

  }

  agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV);

  agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV, 1);

}



static const char separator=',';
@@ -4401,7 +4401,8 @@ bool Item_func_match::fix_fields(THD *thd, Item **ref) 
    return 1;

  }

  table->fulltext_searched=1;

  return agg_arg_collations_for_comparison(cmp_collation, args+1, arg_count-1);

  return agg_arg_collations_for_comparison(cmp_collation,

                                           args+1, arg_count-1, 0);

}



bool Item_func_match::fix_index()