From 2716ccbfce02be2d9c1ff9f8c0550a4362088453 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Sat, 26 Nov 2005 23:36:44 +0100
Subject: mysql-test-run.pl:   Added search for 'my_print_defaults' when
 running from source tree on Windows trigger-grant.test, trigger-compat.test: 
  Removed --text from grep, not portable

mysql-test/t/trigger-compat.test:
  Removed --text from grep, not portable
mysql-test/t/trigger-grant.test:
  Removed --text from grep, not portable
mysql-test/mysql-test-run.pl:
  Added search for 'my_print_defaults' when running from source tree on Windows
---
 mysql-test/t/trigger-compat.test | 2 +-
 mysql-test/t/trigger-grant.test  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/t')

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
 
-- 
cgit v1.2.1


From ccdb1ee999e9f08a600dfb3b9270aeeb6c481673 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Mon, 28 Nov 2005 15:32:26 -0800
Subject: Update list of authors with information from documentation.

mysql-test/r/show_check.result:
  Remove authors from test result
mysql-test/t/show_check.test:
  Don't put list of authors in results, just test that SHOW AUTHORS doesn't
  give us any sort of error
sql/authors.h:
  Add copyright notice, fix formatting of comments, update and alphabetize
  list of authors, fix up formatting of entries.
---
 mysql-test/t/show_check.test | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mysql-test/t')

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
-- 
cgit v1.2.1