Commit 95bf833e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1 

into mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/func_in.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
parents 59a68b89 9241e345

mysql-test/r/func_in.result

+8 −0
Original line number Diff line number Diff line
@@ -157,6 +157,14 @@ a 
bbbb

цццц

drop table t1;

create table t1 (a char(10) character set latin1 not null);

insert into t1 values ('a'),('b'),('c');

select a from t1 where a IN ('a','b','c') order by a;

a

a

b

c

drop table t1;

set names latin1;

select '1.0' in (1,2);

'1.0' in (1,2)

mysql-test/t/func_in.test

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ create table t1 (a char(10) character set utf8 not null); 
insert into t1 values ('bbbb'),(_koi8r'ÃÃÃÃ'),(_latin1'ÄÄÄÄ');

select a from t1 where a in ('bbbb',_koi8r'ÃÃÃÃ',_latin1'ÄÄÄÄ') order by a;

drop table t1;

# Bug#7834 Illegal mix of collations in IN operator

create table t1 (a char(10) character set latin1 not null);

insert into t1 values ('a'),('b'),('c');

select a from t1 where a IN ('a','b','c') order by a;

drop table t1;

set names latin1;



select '1.0' in (1,2);

sql/item_cmpfunc.cc

+4 −55
Original line number Diff line number Diff line
@@ -1776,63 +1776,12 @@ void Item_func_in::fix_length_and_dec() 
  

  agg_cmp_type(&cmp_type, args, arg_count);



  for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)

    const_itm&= arg[0]->const_item();





  if (cmp_type == STRING_RESULT)

  {

    /*

      We allow consts character set conversion for



        item IN (const1, const2, const3, ...)



      if item is in a superset for all arguments,

      and if it is a stong side according to coercibility rules.

   

      TODO: add covnersion for non-constant IN values

      via creating Item_func_conv_charset().

    */



    if (agg_arg_collations_for_comparison(cmp_collation, args, arg_count,

                                          MY_COLL_ALLOW_SUPERSET_CONV))

      return;

    if ((!my_charset_same(args[0]->collation.collation, 

                          cmp_collation.collation) || !const_itm))

    {

      if (agg_arg_collations_for_comparison(cmp_collation, args, arg_count))

  if (cmp_type == STRING_RESULT &&

      agg_arg_charsets(cmp_collation, args, arg_count, MY_COLL_CMP_CONV))

    return;

    }

    else

    {

      /* 

         Conversion is possible:

         All IN arguments are constants.

      */

      Item_arena *arena, backup;

      arena= thd->change_arena_if_needed(&backup);



      for (arg= args+1, arg_end= args+arg_count; arg < arg_end; arg++)

      {

        if (!arg[0]->null_value &&

            !my_charset_same(cmp_collation.collation,

                             arg[0]->collation.collation))

        {

          Item_string *conv;

          String tmp, cstr, *ostr= arg[0]->val_str(&tmp);

          uint dummy_errors;

          cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(),

                    cmp_collation.collation, &dummy_errors);

          conv= new Item_string(cstr.ptr(),cstr.length(), cstr.charset(),

                                arg[0]->collation.derivation);

          conv->str_value.copy();

          arg[0]= conv;

        }

      }

      if (arena)

        thd->restore_backup_item_arena(arena, &backup);

    }

  }

  for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)

    const_itm&= arg[0]->const_item();



  /*

    Row item with NULLs inside can return NULL or FALSE =>