5 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index e85ad303564..89b8bd66848 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -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` (
diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result
index be792c007fc..72d19885101 100644
--- a/mysql-test/r/ctype_recoding.result
+++ b/mysql-test/r/ctype_recoding.result
@@ -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;
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 30c4c75f3d1..d07e4df6e73 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -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 Osnabrück	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 ('Osnabrück');
 t	collation(t)
 aus Osnabrück	latin1_german2_ci
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index eb35aa90fe2..e46027ae8d9 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -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 ..
diff --git a/mysql-test/t/ctype_recoding.test b/mysql-test/t/ctype_recoding.test
index 82d0643b577..5f417352d95 100644
--- a/mysql-test/t/ctype_recoding.test
+++ b/mysql-test/t/ctype_recoding.test
@@ -121,3 +121,13 @@ CREATE TABLE `goodÐÌÏÈÏ` (a int);
 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;