diff options
| author | unknown <brian@brian-akers-computer.local> | 2004-05-25 14:53:55 -0700 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2004-05-25 14:53:55 -0700 |
| commit | 1ceef15c40a9780828aa61f7154e730f1ea25681 (patch) | |
| tree | f0ca71e6ab91e7ac61a2af7d58316f145858901a /BitKeeper | |
| parent | 3a675ff5f8ed659344d7540f811ca052d999407d (diff) | |
| parent | 9a162f9abd5683b1787be03dce7f74c2156842b7 (diff) | |
| download | mariadb-git-1ceef15c40a9780828aa61f7154e730f1ea25681.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
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
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 ab36663aab3..69c49fdc7bf 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -25,6 +25,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 |