diff options
| author | unknown <brian@brian-akers-computer.local> | 2004-06-05 10:43:22 -0700 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2004-06-05 10:43:22 -0700 |
| commit | 895efc07ac23ba8108fb2061b9f6ca0373613195 (patch) | |
| tree | 4b15ba557e8f5854406099ae872ab75e795d8e68 /BitKeeper | |
| parent | 0fc147494a50789506f19ffe91324244b1bf5829 (diff) | |
| parent | 1ceef15c40a9780828aa61f7154e730f1ea25681 (diff) | |
| download | mariadb-git-895efc07ac23ba8108fb2061b9f6ca0373613195.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.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 d55a451a1ba..e419f9edfb9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -26,6 +26,7 @@ bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk bk@mysql.r18.ru +brian@avenger.(none) brian@brian-akers-computer.local carsten@tsort.bitbybit.dk davida@isil.mysql.com |