diff options
| author | unknown <monty@mishka.local> | 2004-04-27 15:48:48 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 15:48:48 +0300 |
| commit | 4f44862bda76461f92100bfe9053e2c62bdd9b53 (patch) | |
| tree | 890fb3189cef1e6fedace9c5f73a2a9a881dfe86 /BitKeeper | |
| parent | c41919f3583aa40645cc10571718b39091980c25 (diff) | |
| parent | a3828081cde644ab551c21a621b8e6ab69923e6a (diff) | |
| download | mariadb-git-4f44862bda76461f92100bfe9053e2c62bdd9b53.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/set_var.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 d844c855de3..52165ee5b7a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -92,6 +92,7 @@ monty@donna.mysql.fi monty@hundin.mysql.fi monty@mashka.(none) monty@mashka.mysql.fi +monty@mishka.local monty@mishka.mysql.fi monty@mysql.com monty@narttu. |