diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-08-08 03:29:36 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-08-08 03:29:36 +0300 |
| commit | a6b15fdd7682bffc2e197ac50e21332bb9bcf297 (patch) | |
| tree | da5d29e4a08217e2773b16c5aef05ab734c760e4 /BitKeeper/etc | |
| parent | 93f5a0616ab15113844fa211a26c44182af8018c (diff) | |
| parent | f01f49916b7a0ea6eaf9f0e4e1dfad911584f8a2 (diff) | |
| download | mariadb-git-a6b15fdd7682bffc2e197ac50e21332bb9bcf297.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
innobase/include/dyn0dyn.h:
Auto merged
innobase/include/dyn0dyn.ic:
Auto merged
myisam/mi_check.c:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -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 b42fbc64c53..961cfb5c9a5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,6 +8,7 @@ akishkin@work.mysql.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com +bar@bar.udmsearch.izhnet.ru bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi |