Commit 1490901e authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1
parents 1489c417 5b8fca74

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -3093,7 +3093,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl 
   ndb/src/common/logger/Makefile dnl

   ndb/src/common/transporter/Makefile dnl

   ndb/src/common/mgmcommon/Makefile dnl

   ndb/src/common/editline/Makefile dnl

   ndb/src/kernel/Makefile dnl

   ndb/src/kernel/error/Makefile dnl

   ndb/src/kernel/blocks/Makefile dnl

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem 
CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)



INCLUDES =			-I$(srcdir)/../include -I../include -I..

bin_PROGRAMS =		mysql_test_run_new

EXTRA_PROGRAMS =		mysql_test_run_new

noinst_HEADERS =	my_manage.h

mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c

mysql-test/r/alter_table.result

+10 −0
Original line number Diff line number Diff line
@@ -483,3 +483,13 @@ ERROR 42000: Incorrect table name 't1\\' 
rename table t1 to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

drop table t1;

create table t1 (a text) character set koi8r;

insert into t1 values (_koi8r'');

select hex(a) from t1;

hex(a)

D4C5D3D4

alter table t1 convert to character set cp1251;

select hex(a) from t1;

hex(a)

F2E5F1F2

drop table t1;

mysql-test/r/ctype_ujis.result

+40 −0
Original line number Diff line number Diff line
@@ -126,3 +126,43 @@ Field Type Null Key Default Extra 
a	char(1)				

b	enum('あ','い')	YES		NULL	

DROP TABLE t1;

CREATE TABLE t1

(

a INTEGER NOT NULL,

b VARCHAR(50) NOT NULL DEFAULT '',

PRIMARY KEY  (a),

KEY b (b(10))

) TYPE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';

INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');

INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');

INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');

SELECT t1.* FROM t1 WHERE b='aaabbbcccddd' ORDER BY a;

a	b

0	aaabbbcccddd

SELECT t1.* FROM t1 WHERE b='eeefffggghhh' ORDER BY a;

a	b

1	eeefffggghhh

SELECT t1.* FROM t1 WHERE b='iiijjjkkkl'   ORDER BY a;

a	b

2	iiijjjkkkl

DROP TABLE t1;

CREATE TABLE t1

(

a INTEGER NOT NULL,

b VARCHAR(50) NOT NULL DEFAULT '',

PRIMARY KEY  (a),

KEY b (b(10))

) TYPE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';

INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');

INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');

INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');

SELECT t1.* FROM t1 WHERE b='aaabbbcccddd' ORDER BY a;

a	b

0	aaabbbcccddd

SELECT t1.* FROM t1 WHERE b='eeefffggghhh' ORDER BY a;

a	b

1	eeefffggghhh

SELECT t1.* FROM t1 WHERE b='iiijjjkkkl'   ORDER BY a;

a	b

2	iiijjjkkkl

DROP TABLE t1;

mysql-test/t/alter_table.test

+12 −0
Original line number Diff line number Diff line
@@ -324,3 +324,15 @@ alter table t1 rename to `t1\\`; 
rename table t1 to `t1\\`;

drop table t1;



#

# Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns

#

# The column's character set was changed but the actual data was not

# modified. In other words, the values were reinterpreted

# as UTF8 instead of being converted.

create table t1 (a text) character set koi8r;

insert into t1 values (_koi8r'');

select hex(a) from t1;

alter table t1 convert to character set cp1251;

select hex(a) from t1;

drop table t1;