diff options
| author | unknown <brian@brian-akers-computer.local> | 2004-04-14 11:59:51 -0400 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2004-04-14 11:59:51 -0400 |
| commit | a76b243293f2fc4ca2b63dfaea544dda04db2a63 (patch) | |
| tree | 2012b7d8a7fb4d76e65ef215d47b9b12d1754756 /BitKeeper | |
| parent | f6686a6e76a6aaa59744769ca1df1b41ff92b34e (diff) | |
| parent | 01bff53c4f71b9d204bc42b654e73d4ec6e6a941 (diff) | |
| download | mariadb-git-a76b243293f2fc4ca2b63dfaea544dda04db2a63.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
BitKeeper/etc/logging_ok:
auto-union
include/my_base.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.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 9210c176e6e..234472f9f4a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -24,6 +24,7 @@ bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk bk@mysql.r18.ru +brian@brian-akers-computer.local carsten@tsort.bitbybit.dk davida@isil.mysql.com dlenev@brandersnatch.localdomain |