bzr commit into mysql-6.0 branch (konstantin:2660) Bug#36787

[Konstantin Osipov]

#At file:///opt/local/work/mysql-6.0-runtime/

 2660 Konstantin Osipov	2008-06-27
      Disable funcs_1.charset_collation_1 (Bug#36787)
modified:
  mysql-test/suite/funcs_1/t/disabled.def

per-file messages:
  mysql-test/suite/funcs_1/t/disabled.def
    Disable the failing test (a bug has been reported).
=== modified file 'mysql-test/suite/funcs_1/t/disabled.def'
--- a/mysql-test/suite/funcs_1/t/disabled.def	2008-06-19 18:56:48 +0000
+++ b/mysql-test/suite/funcs_1/t/disabled.def	2008-06-27 16:56:39 +0000
@@ -16,3 +16,4 @@ falcon_storedproc: Bug#37525 funcs_1: <e
 memory_storedproc: Bug#37525 funcs_1: <engine>_storedproc.test fail
 myisam_storedproc: Bug#37525 funcs_1: <engine>_storedproc.test fail
 ndb_storedproc: Bug#37525 funcs_1: <engine>_storedproc.test fail
+charset_collation_1 : Bug #36787 Test funcs_1.charset_collation_1 failing