Commit 8f29cc3e authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/t/ctype_ucs.test:
  Auto merged
sql/sql_update.cc:
  Auto merged
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
parents 4f5664f3 c37389cf

mysql-test/r/ctype_ucs.result

+7 −0
Original line number Diff line number Diff line
@@ -685,6 +685,13 @@ hex(a) 
005B

803D

drop table t1;

create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;

insert into t1 values('a');

create index t1f1 on t1(f1);

select f1 from t1 where f1 like 'a%';

f1

a

drop table t1;

CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));

INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);

update t1 set b=a;

mysql-test/t/ctype_ucs.test

+8 −0
Original line number Diff line number Diff line
@@ -421,6 +421,14 @@ insert into t1 values (0x005b); 
select hex(a) from t1;

drop table t1;



#

# Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation

#

create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;

insert into t1 values('a');

create index t1f1 on t1(f1);

select f1 from t1 where f1 like 'a%';

drop table t1;

# End of 4.1 tests



#

strings/ctype-ucs2.c

+39 −3
Original line number Diff line number Diff line
@@ -1373,14 +1373,50 @@ int my_strnncoll_ucs2_bin(CHARSET_INFO *cs, 
  return (int) (t_is_prefix ? t-te : ((se-s) - (te-t)));

}



static int my_strnncollsp_ucs2_bin(CHARSET_INFO *cs, 

static int my_strnncollsp_ucs2_bin(CHARSET_INFO *cs __attribute__((unused)), 

                                   const uchar *s, uint slen, 

                                   const uchar *t, uint tlen,

                                   my_bool diff_if_only_endspace_difference

                                   __attribute__((unused)))

{

  /* TODO: Needs to be fixed to handle end space! */

  return my_strnncoll_ucs2_bin(cs,s,slen,t,tlen,0);

  const uchar *se, *te;

  uint minlen;



  /* extra safety to make sure the lengths are even numbers */

  slen= (slen >> 1) << 1;

  tlen= (tlen >> 1) << 1;



  se= s + slen;

  te= t + tlen;



  for (minlen= min(slen, tlen); minlen; minlen-= 2)

  {

    int s_wc= s[0] * 256 + s[1];

    int t_wc= t[0] * 256 + t[1];

    if ( s_wc != t_wc )

      return  s_wc > t_wc ? 1 : -1;



    s+= 2;

    t+= 2;

  }



  if (slen != tlen)

  {

    int swap= 1;

    if (slen < tlen)

    {

      s= t;

      se= te;

      swap= -1;

    }



    for ( ; s < se ; s+= 2)

    {

      if (s[0] || s[1] != ' ')

        return (s[0] == 0 && s[1] < ' ') ? -swap : swap;

    }

  }

  return 0;

}