summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2002-05-14 18:00:06 +0200
committerunknown <serg@sergbook.mysql.com>2002-05-14 18:00:06 +0200
commitac6c4f6cb7f9f9523408439048cc82da1a6b8a07 (patch)
tree528ac112a364610fa3a495cbb5a0113a97561c42 /mysql-test
parentb2a96dd8842b888e545d5fed33dfb7edf67cd11f (diff)
parent4b4b955e5fedf33011f381f3bc90cfb464bb2843 (diff)
downloadmariadb-git-ac6c4f6cb7f9f9523408439048cc82da1a6b8a07.tar.gz
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/func_encrypt-master.opt2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/func_encrypt-master.opt b/mysql-test/t/func_encrypt-master.opt
index 0b042f52e9a..ab687810d5f 100644
--- a/mysql-test/t/func_encrypt-master.opt
+++ b/mysql-test/t/func_encrypt-master.opt
@@ -1 +1 @@
---des-key-file=$MYSQL_TEST_DIR/std_data/des_key_file
+--loose-des-key-file=$MYSQL_TEST_DIR/std_data/des_key_file