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

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

6 files changed, 12 insertions, 10 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 70814aa899e..9a0eca52b84 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -50,7 +50,7 @@ create table t1 (t1.index int);
 drop table t1;
 drop database if exists test_$1;
 Warnings:
-Note	1008	Can't drop database 'test_$1'. Database doesn't exist
+Note	1008	Can't drop database 'test_$1'; database doesn't exist
 create database test_$1;
 create table test_$1.$test1 (a$1 int, $b int, c$ int);
 insert into test_$1.$test1 values (1,2,3);
@@ -252,7 +252,7 @@ id	name
 drop table t2, t3;
 drop database if exists test_$1;
 Warnings:
-Note	1008	Can't drop database 'test_$1'. Database doesn't exist
+Note	1008	Can't drop database 'test_$1'; database doesn't exist
 create database test_$1;
 create table test_$1.t3 like t1;
 create temporary table t3 like test_$1.t3;
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index 2b878455bea..9555ea452ca 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -13,7 +13,7 @@ n
 1
 drop database if exists mysqltest;
 Warnings:
-Note	1008	Can't drop database 'mysqltest'. Database doesn't exist
+Note	1008	Can't drop database 'mysqltest'; database doesn't exist
 create database mysqltest;
 drop database if exists mysqltest;
 create database mysqltest;
@@ -27,7 +27,7 @@ create database mysqltest;
 drop database mysqltest;
 drop database if exists mysqltest;
 Warnings:
-Note	1008	Can't drop database 'mysqltest'. Database doesn't exist
+Note	1008	Can't drop database 'mysqltest'; database doesn't exist
 flush tables with read lock;
 create database mysqltest;
 Got one of the listed errors
@@ -48,4 +48,4 @@ Database
 mysql
 test
 drop database mysqltest;
-ERROR HY000: Can't drop database 'mysqltest'. Database doesn't exist
+ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist
diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result
index dc1d8c4872e..d0faf0435e3 100644
--- a/mysql-test/r/rpl000009.result
+++ b/mysql-test/r/rpl000009.result
@@ -21,7 +21,7 @@ n	m
 drop database mysqltest;
 drop database if exists mysqltest2;
 drop database mysqltest;
-ERROR HY000: Can't drop database 'mysqltest'. Database doesn't exist
+ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist
 drop database mysqltest2;
 set sql_log_bin = 0;
 create database mysqltest2;
@@ -48,8 +48,8 @@ mysql
 test
 load data from master;
 Warnings:
-Note	1008	Can't drop database 'mysqltest'. Database doesn't exist
-Note	1008	Can't drop database 'mysqltest2'. Database doesn't exist
+Note	1008	Can't drop database 'mysqltest'; database doesn't exist
+Note	1008	Can't drop database 'mysqltest2'; database doesn't exist
 show databases;
 Database
 mysql
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index 3efc69d2f64..f12b98ba041 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -46,7 +46,7 @@ rename table t7 to t9;
 drop table t1;
 Got one of the listed errors
 Warnings:
-Note	1008	Can't drop database 'test_mysqltest'. Database doesn't exist
+Note	1008	Can't drop database 'test_mysqltest'; database doesn't exist
 Got one of the listed errors
 Got one of the listed errors
 Got one of the listed errors
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index add9051ddfb..d84c284d7b4 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -32,7 +32,7 @@ Level	Code	Message
 Note	1051	Unknown table 'not_exists_table'
 drop database if exists not_exists_db;
 Warnings:
-Note	1008	Can't drop database 'not_exists_db'. Database doesn't exist
+Note	1008	Can't drop database 'not_exists_db'; database doesn't exist
 show count(*) warnings;
 @@session.warning_count
 1
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index ec2488f520a..144e6d7e74a 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -489,6 +489,8 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*)
 	if (!to->eq_def(from))
 	  return do_field_string;
       }
+      else if (to->charset() != from->charset())
+	return do_field_string;
       else if (to->real_type() == FIELD_TYPE_VAR_STRING && to_length !=
 	       from_length)
 	return do_varstring;