diff options
author | unknown <serg@serg.mysql.com> | 2002-08-31 23:38:10 +0000 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2002-08-31 23:38:10 +0000 |
commit | f7d6288db21cbfc1315403adfcf8f2e59a5f305f (patch) | |
tree | 91af427b2b554f4b9c83954455900c2424386e02 /BitKeeper | |
parent | 9a1953781acf6de68376ee4a54b8242af7fa2ae3 (diff) | |
parent | c8f6ea2c7c0ae7521025a7ed25d5ee40bd1f9b69 (diff) | |
download | mariadb-git-f7d6288db21cbfc1315403adfcf8f2e59a5f305f.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
Docs/manual.texi:
Auto merged
innobase/configure.in:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0grm.c:
Auto merged
innobase/pars/pars0grm.y:
Auto merged
innobase/pars/pars0lex.l:
Auto merged
innobase/row/row0mysql.c:
Auto merged
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0bb4d3ceb88..bee07b37c43 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -29,6 +29,7 @@ jorge@linux.jorge.mysql.com kaj@work.mysql.com lenz@kallisto.mysql.com lenz@mysql.com +miguel@hegel.br miguel@hegel.local miguel@light.local monty@bitch.mysql.fi @@ -43,6 +44,7 @@ monty@tramp.mysql.fi monty@work.mysql.com mwagner@cash.mwagner.org mwagner@evoq.mwagner.org +nick@mysql.com nick@nick.leippe.com paul@central.snake.net paul@teton.kitebird.com @@ -75,5 +77,3 @@ worm@altair.is.lan zak@balfor.local zak@linux.local zgreant@mysql.com -miguel@hegel.br -nick@mysql.com |