diff options
| author | unknown <dellis@goetia.(none)> | 2004-10-17 18:47:08 -0500 |
|---|---|---|
| committer | unknown <dellis@goetia.(none)> | 2004-10-17 18:47:08 -0500 |
| commit | 38e717ea13bafb1d63865b6b326e78732b6b988b (patch) | |
| tree | 3682568bcab37798317eac13f759dc77cf04613c /BitKeeper | |
| parent | 09da504c1c8a497cd73c43834c5d5ed0128d2521 (diff) | |
| parent | 5dfa8d859be85f14e60771fb31693c68d8eee26c (diff) | |
| download | mariadb-git-38e717ea13bafb1d63865b6b326e78732b6b988b.tar.gz | |
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
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 8347685b9b2..060586b6874 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -24,6 +24,7 @@ bk@admin.bk brian@brian-akers-computer.local carsten@tsort.bitbybit.dk davida@isil.mysql.com +dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com dlenev@mysql.com |