From: Alexander Barkov
Date: February 2 2012 12:33pm
Subject: bzr push into mysql-trunk branch (alexander.barkov:3829)
List-Archive: http://lists.mysql.com/commits/142721
Message-Id: <201202021235.q12CZu5d009127@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3829 Alexander Barkov	2012-02-02 [merge]
      Merging from mysql-trunk

    modified:
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
=== modified file 'mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result'
--- a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result	2011-01-05 08:43:46 +0000
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result	2012-02-02 12:29:12 +0000
@@ -81,6 +81,7 @@ utf8_german2_ci	utf8	212		#	#
 utf8_croatian_ci	utf8	213		#	#
 utf8_unicode_520_ci	utf8	214		#	#
 utf8_vietnamese_ci	utf8	215		#	#
+utf8_general_mysql500_ci	utf8	223		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
 ucs2_unicode_ci	ucs2	128		#	#
@@ -107,6 +108,7 @@ ucs2_german2_ci	ucs2	148		#	#
 ucs2_croatian_ci	ucs2	149		#	#
 ucs2_unicode_520_ci	ucs2	150		#	#
 ucs2_vietnamese_ci	ucs2	151		#	#
+ucs2_general_mysql500_ci	ucs2	159		#	#
 cp866_general_ci	cp866	36	Yes	#	#
 cp866_bin	cp866	68		#	#
 keybcs2_general_ci	keybcs2	37	Yes	#	#

=== modified file 'mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result'
--- a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result	2011-01-05 08:43:46 +0000
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result	2012-02-02 12:29:12 +0000
@@ -81,6 +81,7 @@ utf8_german2_ci	utf8	212		#	#
 utf8_croatian_ci	utf8	213		#	#
 utf8_unicode_520_ci	utf8	214		#	#
 utf8_vietnamese_ci	utf8	215		#	#
+utf8_general_mysql500_ci	utf8	223		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
 ucs2_unicode_ci	ucs2	128		#	#
@@ -107,6 +108,7 @@ ucs2_german2_ci	ucs2	148		#	#
 ucs2_croatian_ci	ucs2	149		#	#
 ucs2_unicode_520_ci	ucs2	150		#	#
 ucs2_vietnamese_ci	ucs2	151		#	#
+ucs2_general_mysql500_ci	ucs2	159		#	#
 cp866_general_ci	cp866	36	Yes	#	#
 cp866_bin	cp866	68		#	#
 keybcs2_general_ci	keybcs2	37	Yes	#	#

No bundle (reason: useless for push emails).