summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--mysql-test/t/func_encrypt-master.opt2
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 8e4996cb76b..439a0bf8b9a 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -51,3 +51,4 @@ tonu@x3.internalnet
venu@work.mysql.com
zak@balfor.local
zak@linux.local
+serg@sergbook.mysql.com
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