bzr commit into mysql-6.0 tree (mleich:2706) Bug#37160

[Matthias Leich]

#At file:///work2/6.0/mysql-6.0-bugteam-funcs_1/

------------------------------------------------------------
revno: 2706
revision-id: mleich@stripped
parent: mattiasj@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-6.0-bugteam-funcs_1
timestamp: Mi 2008-07-09 21:07:10 +0200
message:
  Upmerge 5.1 -> 6.0
modified:
  mysql-test/suite/funcs_2/charset/charset_master.test
sp1f-charset_master.test-20070206175440-sgefy4i6nwwi43svr5asovdpgvmycuvr
  mysql-test/suite/funcs_2/t/innodb_charset.test
sp1f-innodb_charset.test-20070206180358-jwznkkalaqtecydoobuidk436pokqmvc
  mysql-test/suite/funcs_2/t/memory_charset.test
sp1f-memory_charset.test-20070206180358-5uoxm3xp5xysaoi3lql7pj3vous7wi6k
  mysql-test/suite/funcs_2/t/myisam_charset.test
sp1f-myisam_charset.test-20070206180358-4ddnsur4zeb2tsnsl24l2b4pm463jajn
  mysql-test/suite/funcs_2/t/ndb_charset.test
sp1f-ndb_charset.test-20070206180358-jzvzee7vehbt3ze2rsdpfbms3xbnqoha
    ------------------------------------------------------------
    revno: 2497.259.13
    revision-id: mleich@stripped
    parent: mattiasj@stripped
    parent: mleich@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-funcs_1
    timestamp: Mi 2008-07-09 20:55:23 +0200
    message:
      Upmerge 5.0 -> 5.1
    modified:
      mysql-test/suite/funcs_2/charset/charset_master.test
sp1f-charset_master.test-20070206175440-sgefy4i6nwwi43svr5asovdpgvmycuvr
      mysql-test/suite/funcs_2/t/innodb_charset.test
sp1f-innodb_charset.test-20070206180358-jwznkkalaqtecydoobuidk436pokqmvc
      mysql-test/suite/funcs_2/t/memory_charset.test
sp1f-memory_charset.test-20070206180358-5uoxm3xp5xysaoi3lql7pj3vous7wi6k
      mysql-test/suite/funcs_2/t/myisam_charset.test
sp1f-myisam_charset.test-20070206180358-4ddnsur4zeb2tsnsl24l2b4pm463jajn
      mysql-test/suite/funcs_2/t/ndb_charset.test
sp1f-ndb_charset.test-20070206180358-jzvzee7vehbt3ze2rsdpfbms3xbnqoha
    ------------------------------------------------------------
    revno: 1810.3748.3
    revision-id: mleich@stripped
    parent: mats@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.0-bugteam-funcs_1
    timestamp: Mi 2008-07-09 13:22:07 +0200
    message:
      1. Fix for Bug#37160
         "funcs_2: The tests do not check if optional character
                     sets exist."
      2. Minor cleanup
    modified:
      mysql-test/suite/funcs_2/charset/charset_master.test
sp1f-charset_master.test-20070206175440-sgefy4i6nwwi43svr5asovdpgvmycuvr
      mysql-test/suite/funcs_2/t/innodb_charset.test
sp1f-innodb_charset.test-20070206180358-jwznkkalaqtecydoobuidk436pokqmvc
      mysql-test/suite/funcs_2/t/memory_charset.test
sp1f-memory_charset.test-20070206180358-5uoxm3xp5xysaoi3lql7pj3vous7wi6k
      mysql-test/suite/funcs_2/t/myisam_charset.test
sp1f-myisam_charset.test-20070206180358-4ddnsur4zeb2tsnsl24l2b4pm463jajn
      mysql-test/suite/funcs_2/t/ndb_charset.test
sp1f-ndb_charset.test-20070206180358-jzvzee7vehbt3ze2rsdpfbms3xbnqoha

Attachment: [text/text/x-diff] patch-2706.diff