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
Showing
mysql-test/r/sp-ucs2.result
0 → 100644
mysql-test/t/sp-ucs2.test
0 → 100644
Please register or sign in to comment