diff options
| author | unknown <vtkachenko@mail.mysql.com> | 2005-01-12 21:03:06 +0100 |
|---|---|---|
| committer | unknown <vtkachenko@mail.mysql.com> | 2005-01-12 21:03:06 +0100 |
| commit | c846af9ba2ec7f4aff91ea97e85893c3312d2c93 (patch) | |
| tree | 4c556c0360794ec5c1e71dde398325d1f1c86128 /BitKeeper/etc | |
| parent | fd7e0d847b6fd2d0f9729b3c6a37f19e62d67128 (diff) | |
| parent | 8f61caea0a8964dc434ed1cc8fb91e48463c540f (diff) | |
| download | mariadb-git-c846af9ba2ec7f4aff91ea97e85893c3312d2c93.tar.gz | |
Merge
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
resolve conflicts
Diffstat (limited to 'BitKeeper/etc')
| -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 0f4bc8d7b37..02e65271dbe 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -244,6 +244,7 @@ venu@hundin.mysql.fi venu@myvenu.com venu@work.mysql.com vtkachenko@intelp4d.mysql.com +vtkachenko@mail.mysql.com vva@eagle.mysql.r18.ru vva@genie.(none) vva@mysql.r18.ru |