3379 Alexander Nozdrin 2011-05-06 [merge]
Manual merge from mysql-5.5.
Conflicts:
- mysql-test/r/cast.result
modified:
scripts/make_win_bin_dist
3378 Alexander Nozdrin 2011-05-06 [merge]
Null-merge from mysql-5.5.
3377 Alexander Nozdrin 2011-05-06 [merge]
Manual merge from mysql-5.5.
Conflicts:
- mysql-test/r/mysqldump.result
modified:
mysql-test/r/mysqldump.result
mysql-test/t/mysqldump.test
3376 Luis Soares 2011-05-06
BUG#12407446
Post-push fix. Fixing result file for:
- funcs_1.is_columns_mysql_embedded
modified:
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result 2011-03-17 12:45:19 +0000
+++ b/mysql-test/r/mysqldump.result 2011-05-06 12:47:37 +0000
@@ -4631,7 +4631,7 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
DROP DATABASE `test-database`;
-USE `test`;
+USE test;
#
# End of 5.1 tests
#
=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test 2011-03-17 12:45:19 +0000
+++ b/mysql-test/t/mysqldump.test 2011-05-06 12:47:37 +0000
@@ -2211,7 +2211,7 @@ ALTER DATABASE `test-database` CHARACTER
DROP DATABASE `test-database`;
# Switching back to test database.
-USE `test`;
+USE test;
--echo #
--echo # End of 5.1 tests
=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist 2011-03-08 19:14:42 +0000
+++ b/scripts/make_win_bin_dist 2011-05-06 12:56:36 +0000
@@ -181,6 +181,7 @@ cp Docs/INSTALL-BINARY $DESTDIR/Docs/
cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true
cp ChangeLog $DESTDIR/Docs/ || /bin/true
cp support-files/my-*.ini $DESTDIR/
+cp README $DESTDIR/
if [ -f COPYING ] ; then
cp COPYING $DESTDIR/
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (alexander.nozdrin:3376 to 3379) | Alexander Nozdrin | 6 May |
