diff options
| author | unknown <tonu@x153.internalnet> | 2001-07-24 15:00:36 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-07-24 15:00:36 +0800 |
| commit | 55fbccfd81b61934c75082006b8c53c01a666359 (patch) | |
| tree | c83d351c310d448d629eb358d6f4f5c22f640651 /BitKeeper | |
| parent | cab947d58a123384489541dfd3b681ca15c298a2 (diff) | |
| parent | 2ec8dce13dc2357179244e73e97648034b7cc5a6 (diff) | |
| download | mariadb-git-55fbccfd81b61934c75082006b8c53c01a666359.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysql/libmysql.c:
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 0df6899992e..c6322c3ac81 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -22,4 +22,5 @@ tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com tonu@hundin.mysql.fi +tonu@x153.internalnet tonu@x3.internalnet |