bk commit into 5.2 tree (mleich:1.2608) BUG#31407

[mleich]

Below is the list of changes that have just been committed into a local
5.2 repository of mleich. When mleich does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-10 20:02:30+02:00, mleich@stripped +1 -0
  Post merge fix for
     Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results
  Repairing the issues (outside of #31407) within the <engine>__datadict tests in MySQL 5.2
  exceeds the purpose of a post merge fix.
  Final solution:
  - disable <engine>__datadict test for 5.2
  - Bug 31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing

  mysql-test/suite/funcs_1/t/disabled.def@stripped, 2007-10-10 20:02:28+02:00, mleich@stripped +4 -0
    Disable the <engine>__datadict tests

diff -Nrup a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def
--- a/mysql-test/suite/funcs_1/t/disabled.def	2007-10-10 15:37:31 +02:00
+++ b/mysql-test/suite/funcs_1/t/disabled.def	2007-10-10 20:02:28 +02:00
@@ -13,4 +13,8 @@
 innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
 memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
 myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
+innodb__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
+memory__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
+myisam__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
+ndb__datadict: 2007-10-10 mleich Bug#31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing
 ndb__datadict: 2007-10-08 mleich Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results