diff options
| author | unknown <kaa@polly.local> | 2007-02-20 23:16:18 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-02-20 23:16:18 +0300 |
| commit | e0b6803864519beaa101a4ca65ecdf4b4ce94c01 (patch) | |
| tree | a005f075576d4550ecaf633bd0871ea4e5113a3f /mysql-test/r/mysqlbinlog.result | |
| parent | b7b774ee29c10afdce9e71ac45002389f18fe97c (diff) | |
| parent | dc3d28869400d24346edb24232b5f930a51aa535 (diff) | |
| download | mariadb-git-e0b6803864519beaa101a4ca65ecdf4b4ce94c01.tar.gz | |
Merge polly.local:/tmp/maint/bug25137/my51-bug25137
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
mysql-test/include/mix2.inc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/r/mysqlbinlog.result:
Manual merge
mysql-test/t/innodb.test:
Manual merge
mysql-test/t/mysql.test:
Manual merge
mysql-test/t/mysqlbinlog.test:
Manual merge
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index d671b347786..86a73fa5c9f 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -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; |