Merge up 5.0-build into 5.1-build:

mostly just the merge changesets,
but also a change of Perl scripts to use "/usr/bin/perl" fixed.

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

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.
 

scripts/mysql_setpermission.sh

@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 ## Emacs, this is -*- perl -*- mode? :-)
 ##
 ##        Permission setter for MySQL

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

scripts/mysqlaccess.sh

@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # ****************************
 package MySQLaccess;
 #use strict;

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

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

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

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

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

sql-bench/crash-me.sh

@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # -*- perl -*-
 # Copyright (C) 2000-2006 MySQL AB
 #

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

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

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

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

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

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

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

sql-bench/server-cfg.sh

@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # -*- perl -*-
 # Copyright (C) 2000-2006 MySQL AB
 #

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

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

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

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

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

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

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

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

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