diff options
| author | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2005-04-04 12:12:50 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2005-04-04 12:12:50 +0500 |
| commit | 042a3ced2833b48eb4f491b10351b3f64587e729 (patch) | |
| tree | 17e6425f737ba15c2e8c3904e041840382becf97 /BitKeeper | |
| parent | e1afce06bdd425b34ff3192da5f61a8690da53ba (diff) | |
| parent | 77d568597fb0c2a50ebdd9c341a2c89138f2ec5a (diff) | |
| download | mariadb-git-042a3ced2833b48eb4f491b10351b3f64587e729.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
BitKeeper/etc/logging_ok:
auto-union
sql/sql_show.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 74619cbb80c..8b880b7c9aa 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -56,6 +56,7 @@ georg@beethoven.local georg@beethoven.site georg@lmy002.wdf.sap.corp gerberb@ou800.zenez.com +gluh@eagle.intranet.mysql.r18.ru gluh@gluh.(none) gluh@gluh.mysql.r18.ru gordon@zero.local.lan |