Commit 55ee2001 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into mysql.com:/home/jimw/my/mysql-5.0-clean
parents 9ec5da11 34b7d36c

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ bar@bar.intranet.mysql.r18.ru 
bar@bar.mysql.r18.ru

bar@bar.udmsearch.izhnet.ru

bar@deer.(none)

bar@eagle.intranet.mysql.r18.ru

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

myisam/myisamchk.c

+2 −2
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ static void usage(void) 
		      can't fix the data file.\n\

  --character-sets-dir=...\n\

                      Directory where character sets are.\n\

  --set-character-set=name\n\

 		      Change the character set used by the index.\n\

  --set-collation=name\n\

 		      Change the collation used by the index.\n\

  -q, --quick         Faster repair by not modifying the data file.\n\

                      One can give a second '-q' to force myisamchk to\n\

		      modify the original datafile in case of duplicate keys.\n\

mysql-test/r/ctype_big5.result

+7 −0
Original line number Diff line number Diff line
@@ -77,3 +77,10 @@ big5_bin 6109 
big5_bin	61

big5_bin	6120

drop table t1;

SET NAMES big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('ùØ');

SELECT * FROM t1;

a

ùØ

DROP TABLE t1;

mysql-test/r/ctype_ucs.result

+8 −0
Original line number Diff line number Diff line
@@ -642,3 +642,11 @@ Warnings: 
Warning	1264	Out of range value adjusted for column 'Field1' at row 1

DROP TABLE t1;

SET NAMES latin1;

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;

SELECT * FROM t1;

a	b

1.1	1.100

2.1	2.100

DROP TABLE t1;

mysql-test/r/func_str.result

+20 −0
Original line number Diff line number Diff line
@@ -639,6 +639,26 @@ drop table t1; 
select charset(null), collation(null), coercibility(null);

charset(null)	collation(null)	coercibility(null)

binary	binary	5

CREATE TABLE t1 (a int, b int);

CREATE TABLE t2 (a int, b int);

INSERT INTO t1 VALUES (1,1),(2,2);

INSERT INTO t2 VALUES (2,2),(3,3);

select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)

where collation(t2.a) = _utf8'binary' order by t1.a,t2.a;

a	b	a	b

1	1	NULL	NULL

2	2	2	2

select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)

where charset(t2.a) = _utf8'binary' order by t1.a,t2.a;

a	b	a	b

1	1	NULL	NULL

2	2	2	2

select t1.*,t2.* from t1 left join t2 on (t1.b=t2.b)

where coercibility(t2.a) = 2 order by t1.a,t2.a;

a	b	a	b

1	1	NULL	NULL

2	2	2	2

DROP TABLE t1, t2;

select SUBSTR('abcdefg',3,2);

SUBSTR('abcdefg',3,2)

cd