diff options
| author | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
| commit | 74e3399af186b3159738c0c9c55672f0dbd7705c (patch) | |
| tree | cc7389163da24340a03858b997927a41eeedc545 /BitKeeper | |
| parent | 4e09f14b18ededb18aab527abe582fca34afe79c (diff) | |
| parent | 1c50f8ac7894e7a59e25f720ab700cbe73986347 (diff) | |
| download | mariadb-git-74e3399af186b3159738c0c9c55672f0dbd7705c.tar.gz | |
merge
sql/item_strfunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
sql/net_serv.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 48144e71863..177107f8779 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -73,6 +73,7 @@ monty@donna.mysql.fi monty@hundin.mysql.fi monty@mashka.(none) monty@mashka.mysql.fi +monty@mishka.mysql.fi monty@narttu. monty@narttu.mysql.fi monty@rescue. |