diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-04 19:26:35 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-04 19:26:35 +0200 |
| commit | 84f89641cfc6acff016b973c3bfa12ef0a31fe12 (patch) | |
| tree | 5a32b384f0388487fb7fee12035b2f2e36fb75d9 /BitKeeper | |
| parent | 7b3cd08e9bb71e57102a5aa5ab2237980bf92b02 (diff) | |
| parent | dab1b26b1d3ec57e11681459282de2fe81e362f3 (diff) | |
| download | mariadb-git-84f89641cfc6acff016b973c3bfa12ef0a31fe12.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
libmysqld/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
sql/sql_bitmap.h:
merge
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a559e0f9b0d..5d06a8aac73 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -88,6 +88,7 @@ hf@deer.mysql.r18.ru hf@genie.(none) holyfoot@mysql.com igor@hundin.mysql.fi +igor@igor-inspiron.creware.com igor@linux.local igor@rurik.mysql.com ingo@mysql.com @@ -239,6 +240,7 @@ rburnett@bk-internal.mysql.com rburnett@build.mysql.com reggie@bob.(none) reggie@mdk10.(none) +reggie@monster. root@home.(none) root@mc04.(none) root@x3.internalnet |