Commit 2716ccbf authored by unknown's avatar unknown
Browse files

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
parent 29805bab

mysql-test/mysql-test-run.pl

+6 −3
Original line number Diff line number Diff line
@@ -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/");

mysql-test/t/trigger-compat.test

+1 −1
Original line number Diff line number Diff line
@@ -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



#

mysql-test/t/trigger-grant.test

+1 −1
Original line number Diff line number Diff line
@@ -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