1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
unknown 2003-07-11 15:06:07 +02:00
commit 97d9742f10
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/create.result
View File

@ -50,7 +50,7 @@ create table t1 (t1.index int);
drop table t1; drop table t1;
drop database if exists test_$1; drop database if exists test_$1;
Warnings: 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 database test_$1;
create table test_$1.$test1 (a$1 int, $b int, c$ int); create table test_$1.$test1 (a$1 int, $b int, c$ int);
insert into test_$1.$test1 values (1,2,3); insert into test_$1.$test1 values (1,2,3);
@ -252,7 +252,7 @@ id name
drop table t2, t3; drop table t2, t3;
drop database if exists test_$1; drop database if exists test_$1;
Warnings: 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 database test_$1;
create table test_$1.t3 like t1; create table test_$1.t3 like t1;
create temporary table t3 like test_$1.t3; create temporary table t3 like test_$1.t3;

6
mysql-test/r/drop.result
View File

@ -13,7 +13,7 @@ n
1 1
drop database if exists mysqltest; drop database if exists mysqltest;
Warnings: 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; create database mysqltest;
drop database if exists mysqltest; drop database if exists mysqltest;
create database mysqltest; create database mysqltest;
@ -27,7 +27,7 @@ create database mysqltest;
drop database mysqltest; drop database mysqltest;
drop database if exists mysqltest; drop database if exists mysqltest;
Warnings: 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; flush tables with read lock;
create database mysqltest; create database mysqltest;
Got one of the listed errors Got one of the listed errors
@ -48,4 +48,4 @@ Database
mysql mysql
test test
drop database mysqltest; 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

6
mysql-test/r/rpl000009.result
View File

@ -21,7 +21,7 @@ n m
drop database mysqltest; drop database mysqltest;
drop database if exists mysqltest2; drop database if exists mysqltest2;
drop database mysqltest; 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; drop database mysqltest2;
set sql_log_bin = 0; set sql_log_bin = 0;
create database mysqltest2; create database mysqltest2;
@ -48,8 +48,8 @@ mysql
test test
load data from master; load data from master;
Warnings: Warnings:
Note 1008 Can't drop database 'mysqltest'. 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 Note 1008 Can't drop database 'mysqltest2'; database doesn't exist
show databases; show databases;
Database Database
mysql mysql

2
mysql-test/r/symlink.result
View File

@ -46,7 +46,7 @@ rename table t7 to t9;
drop table t1; drop table t1;
Got one of the listed errors Got one of the listed errors
Warnings: 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 Got one of the listed errors
Got one of the listed errors Got one of the listed errors

2
mysql-test/r/warnings.result
View File

@ -32,7 +32,7 @@ Level Code Message
Note 1051 Unknown table 'not_exists_table' Note 1051 Unknown table 'not_exists_table'
drop database if exists not_exists_db; drop database if exists not_exists_db;
Warnings: 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; show count(*) warnings;
@@session.warning_count @@session.warning_count
1 1

2
sql/field_conv.cc
View File

@ -489,6 +489,8 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*)
if (!to->eq_def(from)) if (!to->eq_def(from))
return do_field_string; 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 != else if (to->real_type() == FIELD_TYPE_VAR_STRING && to_length !=
from_length) from_length)
return do_varstring; return do_varstring;