List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:February 2 2012 12:27pm
Subject:bzr push into mysql-5.5 branch (alexander.barkov:3699 to 3700)
View as plain text  
 3700 Alexander Barkov	2012-02-02 [merge]
      Merging from 5.1

    modified:
      mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
      mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
 3699 Marko Mäkelä	2012-02-02
      ha_innobase::records_in_range(): Remove a debug assertion
      that prohibits an open range (full table).
      This assertion catches unnecessary calls to this method, but such calls
      are not harming correctness.

    modified:
      storage/innobase/handler/ha_innodb.cc
=== 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	2010-05-04 18:10:17 +0000
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result	2012-02-02 12:25:48 +0000
@@ -77,6 +77,7 @@ utf8_persian_ci	utf8	208		#	#
 utf8_esperanto_ci	utf8	209		#	#
 utf8_hungarian_ci	utf8	210		#	#
 utf8_sinhala_ci	utf8	211		#	#
+utf8_general_mysql500_ci	utf8	223		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
 ucs2_unicode_ci	ucs2	128		#	#
@@ -99,6 +100,7 @@ ucs2_persian_ci	ucs2	144		#	#
 ucs2_esperanto_ci	ucs2	145		#	#
 ucs2_hungarian_ci	ucs2	146		#	#
 ucs2_sinhala_ci	ucs2	147		#	#
+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	2010-05-04 18:10:17 +0000
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result	2012-02-02 12:25:48 +0000
@@ -77,6 +77,7 @@ utf8_persian_ci	utf8	208		#	#
 utf8_esperanto_ci	utf8	209		#	#
 utf8_hungarian_ci	utf8	210		#	#
 utf8_sinhala_ci	utf8	211		#	#
+utf8_general_mysql500_ci	utf8	223		#	#
 ucs2_general_ci	ucs2	35	Yes	#	#
 ucs2_bin	ucs2	90		#	#
 ucs2_unicode_ci	ucs2	128		#	#
@@ -99,6 +100,7 @@ ucs2_persian_ci	ucs2	144		#	#
 ucs2_esperanto_ci	ucs2	145		#	#
 ucs2_hungarian_ci	ucs2	146		#	#
 ucs2_sinhala_ci	ucs2	147		#	#
+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).
Thread
bzr push into mysql-5.5 branch (alexander.barkov:3699 to 3700) Alexander Barkov3 Feb