database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  SCCS merged
This commit is contained in:
unknown
2007-02-20 22:23:51 +03:00
parent 92584188d4 db36a2aa5d
commit 96753a29ed
19 changed files with 680 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/mysqlbinlog.result
View File

@ -193,23 +193,6 @@ DELIMITER ;
ROLLBACK /* added by mysqlbinlog */;
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
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
flush logs;
select * from t5 /* must be (1),(1) */;
a
1
@ -269,4 +252,5 @@ call p1();
1
1
drop procedure p1;
drop table t1, t2, t03, t04, t3, t4, t5;
drop table t1, t2, t5;
End of 5.0 tests