diff options
| author | unknown <brian@brian-akers-computer.local> | 2004-04-14 14:36:36 -0400 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2004-04-14 14:36:36 -0400 |
| commit | f10d01a747267e169d9f0b80d30a71b00f0bce7c (patch) | |
| tree | f2093400a62fb1870556251762c63545c99eb586 /BitKeeper | |
| parent | f76d2ce34f4947648fc910669b4639182da6dbaa (diff) | |
| parent | b26c1ed58a6a8026d48b7f27ff9620f61e9a84b0 (diff) | |
| download | mariadb-git-f10d01a747267e169d9f0b80d30a71b00f0bce7c.tar.gz | |
Resolved changes between example storage engine and NDB storage engine.
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Merged in example storage engine with NDB
configure.in:
Resolved conflict between NDB check with EXAMPLE DB.
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 55756692a18..d844c855de3 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 |