1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

Merge polly.local:/tmp/maint/bug25137/my51-bug25137

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
This commit is contained in:
kaa@polly.local
2007-02-20 23:16:18 +03:00
23 changed files with 1250 additions and 1163 deletions

View File

@@ -194,24 +194,6 @@ ROLLBACK /* added by mysqlbinlog */;
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
drop table t1,t2;
flush logs;
create table t3 (f text character set utf8);
create table t4 (f text character set cp932);
flush logs;
rename table t3 to t03, t4 to t04;
select HEX(f) from t03;
HEX(f)
E382BD
select HEX(f) from t3;
HEX(f)
E382BD
select HEX(f) from t04;
HEX(f)
835C
select HEX(f) from t4;
HEX(f)
835C
drop table t3,t4,t03,t04;
flush logs;
flush logs;
select * from t5 /* must be (1),(1) */;
a
@@ -273,4 +255,5 @@ call p1();
1
1
drop procedure p1;
End of 5.0 tests
flush logs;