diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
| commit | 84281294eab2441a118d2c1414c6d6e531e89c5b (patch) | |
| tree | 21a08cbc0f6aecfbbbf13d5cac0d19bc67952322 /BitKeeper | |
| parent | cde9c4299b1f77abed719dbacb278030010760e6 (diff) | |
| parent | c072804d51c2941a955747afc0dae802e8843845 (diff) | |
| download | mariadb-git-84281294eab2441a118d2c1414c6d6e531e89c5b.tar.gz | |
Merge with 4.0 tree
BitKeeper/etc/logging_ok:
auto-union
scripts/Makefile.am:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Auto merged
BUILD/compile-pentium-gcov:
merge
myisam/mi_test2.c:
use original code
mysql-test/t/range.test:
Fixed comment
mysys/mf_keycache.c:
Fixed comments
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 0cb7fbd10fd..86fcc8687d7 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -111,6 +111,7 @@ root@x3.internalnet salle@banica.(none) salle@geopard.(none) salle@geopard.online.bg +salle@vafla.online.bg sasha@mysql.sashanet.com serg@build.mysql2.com serg@serg.mylan |