Merge from main 5.0 to 5.0-build.

9 files changed, 37 insertions, 7 deletions

diff --git a/configure.in b/configure.in
index c34cd661bbd..ab56fc24c71 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.66)
+AM_INIT_AUTOMAKE(mysql, 5.0.68)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=66
+NDB_VERSION_BUILD=68
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
diff --git a/mysql-test/suite/funcs_1/datadict/charset_collation.inc b/mysql-test/suite/funcs_1/datadict/charset_collation.inc
index f8fc58b082b..ae03996b073 100644
--- a/mysql-test/suite/funcs_1/datadict/charset_collation.inc
+++ b/mysql-test/suite/funcs_1/datadict/charset_collation.inc
@@ -8,7 +8,7 @@
 #
 # The amount and properties of character_sets/collations depend on the
 # build type
-# 2007-12 MySQL 5.0
+# 2007-12 MySQL 5.0, 2008-06 MySQL 5.1
 # ---------------------------------------------------------------------
 #
 # Variant 1 fits to
@@ -33,10 +33,22 @@
 # Variant 3 fits to
 #    version_comment       MySQL Community Server (GPL)
 #    version_comment       MySQL Cluster Server (Commercial)
+#    version_comment       MySQL Advanced Server (GPL)         5.1
+#    version_comment       MySQL Advanced Server (Commercial)  5.1
 #
 # Difference between variant 3 and 2 is within the collation properties
 # IS_COMPILED and SORTLEN.
 #
+# 2008-06 All time excluded variant is "vanilla".
+# How to build "vanilla":
+#    ./BUILD/autorun.sh
+#    ./configure
+#    ./make
+# Some properties of "vanilla"
+#    version_comment       Source distribution
+#    Compared to the variants 1 to 3 a lot of character sets are missing.
+#    Example: "ucs2_bin" is in variant 1 to 3 but not in "vanilla".
+#
 # Created:
 # 2007-12-18 mleich - remove the unstable character_set/collation subtests
 #                     from include/datadict-master.inc
diff --git a/mysql-test/suite/funcs_1/t/charset_collation_1.test b/mysql-test/suite/funcs_1/t/charset_collation_1.test
index 7415220455e..15777062a72 100644
--- a/mysql-test/suite/funcs_1/t/charset_collation_1.test
+++ b/mysql-test/suite/funcs_1/t/charset_collation_1.test
@@ -22,9 +22,11 @@ if (`SELECT EXISTS (SELECT 1 FROM information_schema.collations
        OR (    @@version_comment NOT LIKE '%Source%'
            AND @@version_comment NOT LIKE '%Enterprise%'
            AND @@version_comment NOT LIKE '%Classic%'
-           AND @@version_comment NOT LIKE '%Pushbuild%')`)
+           AND @@version_comment NOT LIKE '%Pushbuild%')
+       OR (SELECT count(*) = 0 FROM information_schema.collations
+                    WHERE collation_name = 'ucs2_bin')`)
 {
-  skip Test needs Enterprise, Classic , Pushbuild or Source-without-max build;
+  skip Test needs Enterprise, Classic , regular Pushbuild or Source-without-max build;
 }
 
 --source suite/funcs_1/datadict/charset_collation.inc
diff --git a/mysql-test/suite/funcs_1/t/charset_collation_3.test b/mysql-test/suite/funcs_1/t/charset_collation_3.test
index 0701b96896f..e88b44e4a0f 100644
--- a/mysql-test/suite/funcs_1/t/charset_collation_3.test
+++ b/mysql-test/suite/funcs_1/t/charset_collation_3.test
@@ -16,9 +16,10 @@
 #
 
 if (`SELECT @@version_comment NOT LIKE '%Community%'
-        AND @@version_comment NOT LIKE '%Cluster%'`)
+        AND @@version_comment NOT LIKE '%Cluster%'
+        AND @@version_comment NOT LIKE '%Advanced%'`)
 {
-   skip Test needs Community or Cluster build;
+   skip Test needs Community, Cluster or Advanced build;
 }
 
 --source suite/funcs_1/datadict/charset_collation.inc
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 5dc3e5a1900..e4747ac4564 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -46,6 +46,9 @@ thread_concurrency = 8
 # 
 #skip-networking
 
+# Disable Federated by default
+skip-federated
+
 # Replication Master Server (default)
 # binary logging is required for replication
 log-bin=mysql-bin
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
index 77c6cea56d5..cda11d661bc 100644
--- a/support-files/my-innodb-heavy-4G.cnf.sh
+++ b/support-files/my-innodb-heavy-4G.cnf.sh
@@ -357,6 +357,9 @@ myisam_repair_threads = 1
 myisam_recover
 
 
+# Disable Federated by default
+skip-federated
+
 # *** BDB Specific options ***
 
 # Use this option if you run a MySQL server with BDB support enabled but
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 4dc3f929c48..981b13731e4 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -46,6 +46,9 @@ thread_concurrency = 8
 # 
 #skip-networking
 
+# Disable Federated by default
+skip-federated
+
 # Replication Master Server (default)
 # binary logging is required for replication
 log-bin=mysql-bin
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index 99b6e823f39..c3135ea2c2b 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -44,6 +44,9 @@ myisam_sort_buffer_size = 8M
 # 
 #skip-networking
 
+# Disable Federated by default
+skip-federated
+
 # Replication Master Server (default)
 # binary logging is required for replication
 log-bin=mysql-bin
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index 288df893b4c..cf2ebed463c 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -48,6 +48,9 @@ server-id	= 1
 # Uncomment the following if you want to log updates
 #log-bin=mysql-bin
 
+# Disable Federated by default
+skip-federated
+
 # Uncomment the following if you are NOT using BDB tables
 #skip-bdb