Merge mysql.com:/home/jimw/my/mysql-5.1-release

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers

5 files changed, 14 insertions, 28 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b16d2a190c1..64cebaebb62 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -927,6 +927,9 @@ sub executable_setup () {
                                            "$path_client_bindir/mysqld-debug",);
       $path_language=      mtr_path_exists("$glob_basedir/share/english/");
       $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/charsets");
+
+      $exe_my_print_defaults=
+        mtr_exe_exists("$path_client_bindir/my_print_defaults");
     }
     else
     {
@@ -937,6 +940,8 @@ sub executable_setup () {
 
       $exe_im= mtr_exe_exists(
         "$glob_basedir/server-tools/instance-manager/mysqlmanager");
+      $exe_my_print_defaults=
+        mtr_exe_exists("$glob_basedir/extra/my_print_defaults");
     }
 
     if ( $glob_use_embedded_server )
@@ -963,8 +968,6 @@ sub executable_setup () {
     $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
     $exe_mysql_fix_system_tables=
       mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
-    $exe_my_print_defaults=
-      mtr_script_exists("$glob_basedir/extra/my_print_defaults");
     $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
     $exe_ndb_mgm=        "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
   }
@@ -982,7 +985,7 @@ sub executable_setup () {
       mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",
 			"$glob_basedir/scripts/mysql_fix_privilege_tables");
     $exe_my_print_defaults=
-      mtr_script_exists("$path_client_bindir/my_print_defaults");
+      mtr_exe_exists("$path_client_bindir/my_print_defaults");
 
     $path_language=      mtr_path_exists("$glob_basedir/share/mysql/english/",
                                          "$glob_basedir/share/english/");
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index f6429df702b..de246361128 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -565,25 +565,4 @@ DROP TABLE urkunde;
 SHOW TABLES FROM non_existing_database;
 ERROR 42000: Unknown database 'non_existing_database'
 SHOW AUTHORS;
-Name	Location	Comment
-Brian "Krow" Aker	Seattle, WA. USA	Architecture, archive, federated, buncha of little stuff :)
-David Axmark	Uppsala, Sweden	Small stuff long time ago, Monty ripped it out!
-Omer BarNir	Sunnyvale, CA. USA	Testing (sometimes) and general QA stuff
-Reggie Burnett	Nashville, TN. USA	Windows Server, Connectors
-Alexey Botchkov (Holyfoot)	Izhevsk Russia	GIS extentions (4.1), Embedded Server (4.1), precision math (5.0)
-Oleksandr Byelkin	Lugansk, Ukraine	Query Cache (4.0), Subqueries (4.1), Views (5.0)
-Petr Chardin	Moscow, Russia	Instance Manager (5.0)
-Nikolay Grishakin	Austin, TX. USA	Testing - Server
-Eric Herman	Amsterdam, Netherlands	Bugfixing - federated
-Serge Kozlov	Velikie Luki, Russia	Testing - Cluster
-Matthias Leich	Berlin, Germany	Testing - Server
-Dmitri Lenev	Moscow, Russia	Time zones support (4.1), Triggers (5.0)
-Per-Erik Martin	Uppsala, Sweden	Stored Procedures (5.0)
-Jonathan (Jeb) Miller	Kyle, TX. USA	Testing - Cluster, Replication
-Alexander Nozdrin	Moscow, Russia	Bugfixing (Stored Procedures, 5.0)
-Konstantin Osipov	Moscow, Russia	Prepared statements (4.1), Cursors (5.0)
-Carsten Segieth (Pino)	Fredersdorf, Germany	Testing - Server
-Punita Srivastava	Austin, TX. USA	Testing - Merlin
-Alexey Stroganov (Ranger)	Lugansk, Ukraine	Testing - Benchmarks
-Lars Thalmann	Stockholm, Sweden	Replication and Cluster development
-Sergey Vojtovich	Izhevsk, Russia	Plugins infrastructure (5.1)
+End of 5.1 tests
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index f06dc60af9e..796b855b1df 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -426,5 +426,9 @@ DROP TABLE urkunde;
 SHOW TABLES FROM non_existing_database;
 
 # End of 4.1 tests
-#
+
+--disable_result_log
 SHOW AUTHORS;
+--enable_result_log
+
+--echo End of 5.1 tests
diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test
index ace18639172..c2acc235135 100644
--- a/mysql-test/t/trigger-compat.test
+++ b/mysql-test/t/trigger-compat.test
@@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1
 --echo
 --echo ---> patching t1.TRG...
 
---exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
+--exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
 --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
 
 #
diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test
index c058816ee75..deeaeacbccc 100644
--- a/mysql-test/t/trigger-grant.test
+++ b/mysql-test/t/trigger-grant.test
@@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1
   FOR EACH ROW
     SET @a = 5;
 
---exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
+--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
 --exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG
 --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG