diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:24:14 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:24:14 +0300 |
| commit | d32bdcb1bfc274476cdd945e66e00f3ec31253c3 (patch) | |
| tree | 20f0ccc7be8e0d205ea5a00d6ec5f57a14d85d3f /BitKeeper | |
| parent | dd0d199ebeab47facb4d01269cda97c258491c22 (diff) | |
| parent | 3f6d78f6c7ad5eb00c4d24b0f0b839a1fb1ead25 (diff) | |
| download | mariadb-git-d32bdcb1bfc274476cdd945e66e00f3ec31253c3.tar.gz | |
merge with 4.0.15
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Delete: scripts/mysql_fix_privilege_tables.sql
include/mysql.h:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_update.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
support-files/mysql.spec.sh:
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 4b8d40474a4..dff4cec203c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -22,6 +22,7 @@ carsten@tsort.bitbybit.dk davida@isil.mysql.com dlenev@build.mysql.com dlenev@mysql.com +gerberb@ou800.zenez.com gluh@gluh.(none) gluh@gluh.mysql.r18.ru greg@gcw.ath.cx |