diff options
| author | unknown <jimw@mysql.com> | 2005-11-30 13:51:23 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-30 13:51:23 -0800 |
| commit | 9c81773b37a5ec1a689632e3161ae6b9d1fdeb46 (patch) | |
| tree | b9c649237ea098d61c73d02638e8fbff45391d3f /mysql-test/t | |
| parent | 8486e64f3bced3c5cd2234587235bae970cd8a92 (diff) | |
| parent | b6547d09d637bf971a0e895da6af2bef67307a56 (diff) | |
| download | mariadb-git-9c81773b37a5ec1a689632e3161ae6b9d1fdeb46.tar.gz | |
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
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/show_check.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/trigger-compat.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/trigger-grant.test | 2 |
3 files changed, 7 insertions, 3 deletions
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 |