Commit 7223b9c1 authored by unknown's avatar unknown
Browse files

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

into deer.(none):/home/hf/work/mysql-4.1.6117
parents de0e5012 5be6c328

mysql-test/r/alter_table.result

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ alter table t1 change a a char(10) character set koi8r; 
select a,hex(a) from t1;

a	hex(a)

	D4C5D3D4

delete from t1;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

mysql-test/r/ctype_recoding.result

+8 −0
Original line number Diff line number Diff line
@@ -166,3 +166,11 @@ ERROR HY000: Invalid utf8 character string: ' 
SET NAMES utf8;

CREATE TABLE `good` (a int);

ERROR HY000: Invalid utf8 character string: '` (a int)'

set names latin1;

create table t1 (a char(10) character set koi8r, b text character set koi8r);

insert into t1 values ('test','test');

insert into t1 values ('','');

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

Warning	1265	Data truncated for column 'b' at row 1

drop table t1;

mysql-test/r/fulltext.result

+5 −0
Original line number Diff line number Diff line
@@ -356,6 +356,11 @@ SELECT t, collation(t),MATCH t AGAINST ('Osnabruck') FROM t1 WHERE MATCH t AGAIN 
t	collation(t)	MATCH t AGAINST ('Osnabruck')

aus Osnabrck	utf8_general_ci	1.591139793396

alter table t1 modify t varchar(200) collate latin1_german2_ci not null;

Warnings:

Warning	1265	Data truncated for column 't' at row 3

Warning	1265	Data truncated for column 't' at row 4

Warning	1265	Data truncated for column 't' at row 5

Warning	1265	Data truncated for column 't' at row 6

SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrck');

t	collation(t)

aus Osnabrck	latin1_german2_ci

mysql-test/t/alter_table.test

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ alter table t1 change a a text character set cp1251; 
select a,hex(a) from t1;

alter table t1 change a a char(10) character set koi8r;

select a,hex(a) from t1;

delete from t1;



#

# Test ALTER TABLE .. CHARACTER SET ..

mysql-test/t/ctype_recoding.test

+10 −0
Original line number Diff line number Diff line
@@ -121,3 +121,13 @@ CREATE TABLE `good 
SET NAMES utf8;

--error 1300

CREATE TABLE `good` (a int);





#

# Test that we produce a warnign when conversion loses data.

#

set names latin1;

create table t1 (a char(10) character set koi8r, b text character set koi8r);

insert into t1 values ('test','test');

insert into t1 values ('','');

drop table t1;