merged 5.0-main to 5.0-bugteam

34 files changed, 64 insertions, 31 deletions

diff --git a/configure.in b/configure.in
index 4d2b683b1e3..4fcb1f13f35 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.83)
+AM_INIT_AUTOMAKE(mysql, 5.0.84)
 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=83
+NDB_VERSION_BUILD=84
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 0c4a708dd14..cdb2d9fd598 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -33,7 +33,7 @@ endif
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
-EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite
+EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite collections
 GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr
 PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
@@ -80,6 +80,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
 		$(DESTDIR)$(testdir)/lib \
+                $(DESTDIR)$(testdir)/collections \
 		$(DESTDIR)$(testdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
diff --git a/mysql-test/collections/README b/mysql-test/collections/README
new file mode 100644
index 00000000000..9af84646a40
--- /dev/null
+++ b/mysql-test/collections/README
@@ -0,0 +1,30 @@
+This directory contains collections of test runs that we run during our
+integration and release testing. Each file contains zero or more lines,
+with one invocation of mysql-test-run.pl on each. These invocations are
+written so that, with the assumption that perl is in your search path,
+any collection can run as a shell script or a batch file, with the parent
+mysql-test directory being the current working directory.
+
+During integration testing, we choose the collection to run by following
+these steps:
+
+1) We choose the extension to look for, based on these rules:
+   - If we're running a per-push test, we choose ".push" as the extension.
+   - If we're running a daily test, we choose ".daily" as the extension.
+   - If we're running a weekly test, we choose ".weekly" as the extension.
+
+2) If there is a collection that has the same name as the branch we're
+   testing plus the extension as determined in step 1, we choose that
+   collection.
+
+3) If the branch is unknown or we have removed all characters from it
+   and still not found a matching collection, we choose the name "default"
+   plus the extension determined in step 1. If there is no such file,
+   we give up and don't test anything at all.
+
+4) If we haven't found a collection yet, we remove the last character from 
+   the branch name and go back to step 2.
+
+5) The commands from the collection are run line by line via execv() or
+   similar system calls. They are not run as a shell script. Shell 
+   expansions are not guaranteed to work and most likely won't.
diff --git a/mysql-test/collections/default.daily b/mysql-test/collections/default.daily
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/collections/default.daily
diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push
new file mode 100644
index 00000000000..0f4115c8565
--- /dev/null
+++ b/mysql-test/collections/default.push
@@ -0,0 +1,2 @@
+perl mysql-test-run.pl --timer --force --comment=n_stm
+perl mysql-test-run.pl --timer --force --comment=ps_stm --ps-protocol
diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/collections/default.weekly
diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh
index 77eacc8a9b4..967a8196ebd 100644
--- a/scripts/mysql_find_rows.sh
+++ b/scripts/mysql_find_rows.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000, 2004 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/mysql_fix_extensions.sh b/scripts/mysql_fix_extensions.sh
index fbc72406f5e..6d4e017f678 100644
--- a/scripts/mysql_fix_extensions.sh
+++ b/scripts/mysql_fix_extensions.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # This is a utility for MySQL. It is not needed by any standard part
 # of MySQL.
 
diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh
index 1f5509f9955..9b49345175a 100644
--- a/scripts/mysql_setpermission.sh
+++ b/scripts/mysql_setpermission.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 ## Emacs, this is -*- perl -*- mode? :-)
 ##
 ##        Permission setter for MySQL
diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh
index 6c05afb772c..258e60dc356 100644
--- a/scripts/mysql_zap.sh
+++ b/scripts/mysql_zap.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2002, 2004 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index bcaf9f8af8e..0153a3afa7c 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # ****************************
 package MySQLaccess;
 #use strict;
diff --git a/sql-bench/as3ap.sh b/sql-bench/as3ap.sh
index d84219a37eb..1c672377fd3 100644
--- a/sql-bench/as3ap.sh
+++ b/sql-bench/as3ap.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/bench-count-distinct.sh b/sql-bench/bench-count-distinct.sh
index 31558aa0b2e..5cc9fb555af 100644
--- a/sql-bench/bench-count-distinct.sh
+++ b/sql-bench/bench-count-distinct.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh
index 399c8cb9879..f16e773722f 100644
--- a/sql-bench/bench-init.pl.sh
+++ b/sql-bench/bench-init.pl.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2003, 2005 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/compare-results.sh b/sql-bench/compare-results.sh
index 145c4894ca2..fec65497c57 100644
--- a/sql-bench/compare-results.sh
+++ b/sql-bench/compare-results.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/copy-db.sh b/sql-bench/copy-db.sh
index f74fa68a081..e0c290d2453 100644
--- a/sql-bench/copy-db.sh
+++ b/sql-bench/copy-db.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index b28bdba7f9f..cc8659513c2 100644
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # -*- perl -*-
 # Copyright (C) 2000-2006 MySQL AB
 #
diff --git a/sql-bench/innotest1.sh b/sql-bench/innotest1.sh
index 8675de19ae4..1c5450a1d9e 100644
--- a/sql-bench/innotest1.sh
+++ b/sql-bench/innotest1.sh
@@ -1,4 +1,4 @@
-#!@PERL@

+#!/usr/bin/perl

 ############################################################################

 #     Stress test for MySQL/InnoDB combined database

 #     (c) 2002 Innobase Oy & MySQL AB

diff --git a/sql-bench/innotest1a.sh b/sql-bench/innotest1a.sh
index 93f8a2a443b..876100e5de4 100644
--- a/sql-bench/innotest1a.sh
+++ b/sql-bench/innotest1a.sh
@@ -1,4 +1,4 @@
-#!@PERL@

+#!/usr/bin/perl

 ############################################################################

 #     Stress test for MySQL/InnoDB combined database

 #     (c) 2002 Innobase Oy & MySQL AB

diff --git a/sql-bench/innotest1b.sh b/sql-bench/innotest1b.sh
index 48fe96ebe7d..3f6c9f5bd5f 100644
--- a/sql-bench/innotest1b.sh
+++ b/sql-bench/innotest1b.sh
@@ -1,4 +1,4 @@
-#!@PERL@

+#!/usr/bin/perl

 ############################################################################

 #     Stress test for MySQL/InnoDB combined database

 #     (c) 2002 Innobase Oy & MySQL AB

diff --git a/sql-bench/innotest2.sh b/sql-bench/innotest2.sh
index aea44003903..cfeb0527970 100644
--- a/sql-bench/innotest2.sh
+++ b/sql-bench/innotest2.sh
@@ -1,4 +1,4 @@
-#!@PERL@

+#!/usr/bin/perl

 ############################################################################

 #     Stress test for MySQL/InnoDB combined database

 #     (c) 2002 Innobase Oy & MySQL AB

diff --git a/sql-bench/innotest2a.sh b/sql-bench/innotest2a.sh
index 3d4bb9933da..f77ed3ddadd 100644
--- a/sql-bench/innotest2a.sh
+++ b/sql-bench/innotest2a.sh
@@ -1,4 +1,4 @@
-#!@PERL@

+#!/usr/bin/perl

 ############################################################################

 #     Stress test for MySQL/Innobase combined database

 #     (c) 2000 Innobase Oy & MySQL AB

diff --git a/sql-bench/innotest2b.sh b/sql-bench/innotest2b.sh
index 272b6dcffd0..72a71d06c73 100644
--- a/sql-bench/innotest2b.sh
+++ b/sql-bench/innotest2b.sh
@@ -1,4 +1,4 @@
-#!@PERL@

+#!/usr/bin/perl

 ############################################################################

 #     Stress test for MySQL/Innobase combined database

 #     (c) 2000 Innobase Oy & MySQL AB

diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh
index 7e607b313e4..3338ea30df5 100644
--- a/sql-bench/run-all-tests.sh
+++ b/sql-bench/run-all-tests.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index cd694169aa5..66d1b1591c0 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # -*- perl -*-
 # Copyright (C) 2000-2006 MySQL AB
 #
diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh
index 6d102fd3977..79b38a95506 100644
--- a/sql-bench/test-ATIS.sh
+++ b/sql-bench/test-ATIS.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-alter-table.sh b/sql-bench/test-alter-table.sh
index eb06582dc0b..36db26f4bf3 100644
--- a/sql-bench/test-alter-table.sh
+++ b/sql-bench/test-alter-table.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-big-tables.sh b/sql-bench/test-big-tables.sh
index 0226967bc54..33694a42e17 100644
--- a/sql-bench/test-big-tables.sh
+++ b/sql-bench/test-big-tables.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-connect.sh b/sql-bench/test-connect.sh
index 84175c357aa..d0f3f0791a4 100644
--- a/sql-bench/test-connect.sh
+++ b/sql-bench/test-connect.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-create.sh b/sql-bench/test-create.sh
index bc2f17c1f0a..8c5bb0140fd 100644
--- a/sql-bench/test-create.sh
+++ b/sql-bench/test-create.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh
index 5189e8851e1..eb1856bda75 100644
--- a/sql-bench/test-insert.sh
+++ b/sql-bench/test-insert.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh
index 809755ab4d7..41e8205196e 100644
--- a/sql-bench/test-select.sh
+++ b/sql-bench/test-select.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-transactions.sh b/sql-bench/test-transactions.sh
index 5723c856564..edbfef0e3ce 100644
--- a/sql-bench/test-transactions.sh
+++ b/sql-bench/test-transactions.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
diff --git a/sql-bench/test-wisconsin.sh b/sql-bench/test-wisconsin.sh
index 38ab93e7f4a..1974461a7c4 100644
--- a/sql-bench/test-wisconsin.sh
+++ b/sql-bench/test-wisconsin.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2001, 2003 MySQL AB
 #
 # This library is free software; you can redistribute it and/or