mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-05 06:35:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

Browse source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  SCCS merged
mysql-test/t/ctype_ucs.test:
  SCCS merged
This commit is contained in:
unknown 2008-02-20 19:49:26 +01:00
commit 34838645cb
26 changed files with 373 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
strings/ctype-euc_kr.c
View file

@ -8697,7 +8697,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
my_strnncollsp_simple,
my_strnxfrm_simple, /* strnxfrm */
my_strnxfrmlen_simple,
my_like_range_simple, /* like_range */
my_like_range_mb, /* like_range */
my_wildcmp_mb, /* wildcmp */
my_strcasecmp_mb,
my_instr_mb,

2
strings/ctype-eucjpms.c
View file

@ -8644,7 +8644,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
my_strnncollsp_simple,
my_strnxfrm_simple, /* strnxfrm */
my_strnxfrmlen_simple,
my_like_range_simple,/* like_range */
my_like_range_mb, /* like_range */
my_wildcmp_mb, /* wildcmp */
my_strcasecmp_mb,
my_instr_mb,

2
strings/ctype-gb2312.c
View file

@ -5725,7 +5725,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
my_strnncollsp_simple,
my_strnxfrm_simple, /* strnxfrm */
my_strnxfrmlen_simple,
my_like_range_simple, /* like_range */
my_like_range_mb, /* like_range */
my_wildcmp_mb, /* wildcmp */
my_strcasecmp_mb, /* instr */
my_instr_mb,

2
strings/ctype-ucs2.c
View file

@ -1673,7 +1673,7 @@ static MY_COLLATION_HANDLER my_collation_ucs2_bin_handler =
my_strnncollsp_ucs2_bin,
my_strnxfrm_ucs2_bin,
my_strnxfrmlen_simple,
my_like_range_simple,
my_like_range_ucs2,
my_wildcmp_ucs2_bin,
my_strcasecmp_ucs2_bin,
my_instr_mb,

2
strings/ctype-ujis.c
View file

@ -8501,7 +8501,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
my_strnncollsp_simple,
my_strnxfrm_simple, /* strnxfrm */
my_strnxfrmlen_simple,
my_like_range_simple,/* like_range */
my_like_range_mb, /* like_range */
my_wildcmp_mb, /* wildcmp */
my_strcasecmp_mb,
my_instr_mb,