|
|||||||||||
|
bzr push into mysql-5.1 tree (mleich:2677 to 2677) Bug#36787
From: Matthias Leich <mleich(at)mysql.com>
Date: Thu Jul 03 2008 - 13:11:37 EDT revno: 2677 revision-id: mleich@mysql.com-20080701122150-dnlib3najg9joows parent: joerg@mysql.com-20080630105418-7qoe5ehomgrcdb89 parent: mleich@mysql.com-20080630201606-95wuf4t306mekrgs committer: Matthias Leich <mleich@mysql.com> branch nick: mysql-5.1-qa-funcs_1 timestamp: Tue 2008-07-01 14:21:50 +0200 message: Upmerge 5.0 -> 5.1 modified:
mysql-test/suite/funcs_1/datadict/charset_collation.inc sp1f-charset_collation.in-20080307163305-edrudf23pcobanheiax4mtuw42llel37
mysql-test/suite/funcs_1/t/charset_collation_1.test sp1f-charset_collation_1.-20080307163303-xoj2pleizxk54stjeffsheamxhopuxni
mysql-test/suite/funcs_1/t/charset_collation_3.test sp1f-charset_collation_3.-20080307163303-wvj3wrresuqmlxzn3dvqppaajsi2ajdp
------------------------------------------------------------
revno: 1810.3733.13
revision-id: mleich@mysql.com-20080630201606-95wuf4t306mekrgs parent: mleich@mysql.com-20080625145938-jndgxpx1fu8nwfjl committer: Matthias Leich <mleich@mysql.com> branch nick: mysql-5.0-qa-funcs_1 timestamp: Mon 2008-06-30 22:16:06 +0200 message:
Fix for
Bug#36787 Test funcs_1.charset_collation_1 failing
Details:
1. Skip charset_collation_1 if charset "ucs2_bin" is
missing (property which distincts "vanilla" builds
from the others)
2. Let builds with version_comment LIKE "%Advanced%"
(found them for 5.1) execute charset_collation_3.
3. Update comments charset_collation.inc so that they
reflect the current experiences.
modified:
mysql-test/suite/funcs_1/datadict/charset_collation.inc sp1f-charset_collation.in-20080307163305-edrudf23pcobanheiax4mtuw42llel37
mysql-test/suite/funcs_1/t/charset_collation_1.test sp1f-charset_collation_1.-20080307163303-xoj2pleizxk54stjeffsheamxhopuxni
mysql-test/suite/funcs_1/t/charset_collation_3.test sp1f-charset_collation_3.-20080307163303-wvj3wrresuqmlxzn3dvqppaajsi2ajdp
-- MySQL Code Commits Mailing List For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.comReceived on Thu Jul 3 13:12:09 2008 This archive was generated by hypermail 2.1.8 : Fri Sep 26 2008 - 18:03:08 EDT |
||||||||||
|
|||||||||||