diff options
| author | unknown <igor@rurik.mysql.com> | 2005-03-17 21:47:46 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-03-17 21:47:46 -0800 |
| commit | 0f58efbd487dd1b82c6dd3b5e60304a168793eea (patch) | |
| tree | 94ab95bbdfd76062fef924f256214c261124b49a /BitKeeper | |
| parent | 7e9984b15657bd1a8cd7744ddbccdd071af8500f (diff) | |
| parent | ee2633a7e2d21b55d814d7f34fd47d229409e0e5 (diff) | |
| download | mariadb-git-0f58efbd487dd1b82c6dd3b5e60304a168793eea.tar.gz | |
Manual merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/olap.result:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
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 eff53f4a789..ef063bd6ab7 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -49,6 +49,7 @@ dlenev@jabberwock.localdomain dlenev@mysql.com ejonore@mc03.ndb.mysql.com gbichot@quadita2.mysql.com +gbichot@quadxeon.mysql.com georg@beethoven.local georg@beethoven.site georg@lmy002.wdf.sap.corp |