summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitKeeper/etc/logging_ok3
-rw-r--r--mysql-test/t/func_encrypt-master.opt2
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index fed3d7fd276..b432698b1ff 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -11,6 +11,7 @@ bell@sanja.is.com.ua
davida@isil.mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
+jani@dsl-jkl1657.dial.inet.fi
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi
jani@rhols221.adsl.netsonic.fi
@@ -40,6 +41,7 @@ paul@teton.kitebird.com
root@x3.internalnet
sasha@mysql.sashanet.com
serg@serg.mysql.com
+serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
tfr@sarvik.tfr.cafe.ee
tim@bitch.mysql.fi
@@ -56,4 +58,3 @@ tonu@x3.internalnet
venu@work.mysql.com
zak@balfor.local
zak@linux.local
-jani@dsl-jkl1657.dial.inet.fi
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