diff options
| author | unknown <kent@mysql.com> | 2005-11-26 23:36:44 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-26 23:36:44 +0100 |
| commit | 2716ccbfce02be2d9c1ff9f8c0550a4362088453 (patch) | |
| tree | 24c15c9becc84e125c52a63f19d2888b678c4da3 /mysql-test | |
| parent | 29805bab61bbd77c2a884c4cdbdb7d4d26335143 (diff) | |
| download | mariadb-git-2716ccbfce02be2d9c1ff9f8c0550a4362088453.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 9 | ||||
| -rw-r--r-- | mysql-test/t/trigger-compat.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/trigger-grant.test | 2 |
3 files changed, 8 insertions, 5 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/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 |