Commit 96a45ab0 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
parents 647d895a 8d1e535e

mysql-test/r/ctype_tis620.result

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ CREATE TABLE t1 ( 
recid int(11) NOT NULL auto_increment,

dyninfo text,

PRIMARY KEY  (recid)

) ENGINE=MyISAM;

) ENGINE=MyISAM CHARACTER SET tis620;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -2890,7 +2890,7 @@ SELECT 'a\t' < 'a'; 
SELECT 'a\t' < 'a ';

'a\t' < 'a '

1

CREATE TABLE t1 (a char(10) not null);

CREATE TABLE t1 (a char(10) not null) CHARACTER SET tis620;

INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a ');

SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1;

hex(a)	STRCMP(a,'a')	STRCMP(a,'a ')

mysql-test/t/ctype_tis620-master.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--default-character-set=tis620

mysql-test/t/ctype_tis620.test

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ CREATE TABLE t1 ( 
  recid int(11) NOT NULL auto_increment,

  dyninfo text,

  PRIMARY KEY  (recid)

) ENGINE=MyISAM;

) ENGINE=MyISAM CHARACTER SET tis620;



show create table t1;
@@ -112,7 +112,7 @@ SELECT 'a\0' < 'a '; 
SELECT 'a\t' < 'a';

SELECT 'a\t' < 'a ';



CREATE TABLE t1 (a char(10) not null);

CREATE TABLE t1 (a char(10) not null) CHARACTER SET tis620;

INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a ');

SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1;

DROP TABLE t1;

strings/ctype-big5.c

+1 −1
Original line number Diff line number Diff line
@@ -6290,7 +6290,7 @@ static MY_CHARSET_HANDLER my_charset_big5_handler= 
  my_charpos_mb,

  my_well_formed_len_mb,

  my_lengthsp_8bit,

  my_numcells_mb,

  my_numcells_8bit,

  my_mb_wc_big5,	/* mb_wc       */

  my_wc_mb_big5,	/* wc_mb       */

  my_caseup_str_mb,

strings/ctype-euc_kr.c

+1 −1
Original line number Diff line number Diff line
@@ -8657,7 +8657,7 @@ static MY_CHARSET_HANDLER my_charset_handler= 
  my_charpos_mb,

  my_well_formed_len_mb,

  my_lengthsp_8bit,

  my_numcells_mb,

  my_numcells_8bit,

  my_mb_wc_euc_kr,	/* mb_wc   */

  my_wc_mb_euc_kr,	/* wc_mb   */

  my_caseup_str_mb,