diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-13 15:53:18 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-13 15:53:18 +0200 |
| commit | a63ecdd3b14e7abfd482131c924567bd25aa231a (patch) | |
| tree | dc20d248b63f5dc477b5701978425924a376f6ff /mysql-test/mysql-test-run.sh | |
| parent | f6ff0c4916852517c2f1a0327056a807ffc27b74 (diff) | |
| download | mariadb-git-a63ecdd3b14e7abfd482131c924567bd25aa231a.tar.gz | |
Added FLUSH DES_KEY_FILE.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
Docs/Makefile.am:
Add missing files
Docs/manual.texi:
Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
Removed compiler warnings
mysql-test/mysql-test-run.sh:
Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
New tests
mysql-test/t/func_str.test:
Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
New HEX() function
sql/item_strfunc.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
New HEX() function
sql/item_timefunc.cc:
cleanup
sql/lex.h:
FLUSH DES_KEY_FILE
sql/mysql_priv.h:
FLUSH DES_KEY_FILE
sql/mysqld.cc:
FLUSH DES_KEY_FILE
sql/sql_parse.cc:
Cleanup sql_yacc.yy
sql/sql_yacc.yy:
Cleanup sql_yacc.yy
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 4a9764efa5b..f2f0c2a4234 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -76,7 +76,6 @@ sleep_until_file_exists () exit 1; } - # No paths below as we can't be sure where the program is! BASENAME=`which basename | head -1` @@ -993,7 +992,7 @@ run_testcase () then if [ -f $master_opt_file ] ; then - EXTRA_MASTER_OPT=`$CAT $master_opt_file` + EXTRA_MASTER_OPT=`$CAT $master_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"` stop_master start_master else @@ -1008,7 +1007,7 @@ run_testcase () if [ -f $slave_opt_file ] ; then - EXTRA_SLAVE_OPT=`$CAT $slave_opt_file` + EXTRA_SLAVE_OPT=`$CAT $slave_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"` do_slave_restart=1 else if [ ! -z "$EXTRA_SLAVE_OPT" ] || [ x$SLAVE_RUNNING != x1 ] ; |