diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
| commit | ec81fca2d08a4cb9532aef7404c480f34fe145cb (patch) | |
| tree | aba1618cac773466e58a7ff45f66bb205fe52130 /BitKeeper | |
| parent | 52d5c01d8742960c23bc06be6b046da6e9951694 (diff) | |
| parent | 341d8aaee39951dfd771db2b0da9a689149facf1 (diff) | |
| download | mariadb-git-ec81fca2d08a4cb9532aef7404c480f34fe145cb.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS merged
sql/ha_ndbcluster.cc:
SCCS 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 6c57b7254e0..e3aefbf3efc 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -94,6 +94,7 @@ kostja@oak.local lenz@kallisto.mysql.com lenz@mysql.com magnus@neptunus.(none) +magnus@shellback.(none) marko@hundin.mysql.fi miguel@hegel.(none) miguel@hegel.br |