diff options
| author | unknown <vtkachenko@intelp4d.mysql.com> | 2004-12-31 09:00:34 +0100 |
|---|---|---|
| committer | unknown <vtkachenko@intelp4d.mysql.com> | 2004-12-31 09:00:34 +0100 |
| commit | c4c2c7bceb3a427fe669bfeec6747a72e404e1ad (patch) | |
| tree | 2d4a9134c1f6b640fe3644c0690a6d0f81ec14f5 /BitKeeper/etc | |
| parent | ee4c910422236fd376df0d9688ce0ca39f61fdfc (diff) | |
| parent | af22d870fae05614d893a0acd620e6bb369cc157 (diff) | |
| download | mariadb-git-c4c2c7bceb3a427fe669bfeec6747a72e404e1ad.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_innodb.cc:
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_lex.h:
Auto merged
sql/sql_parse.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 523acd8bcef..a1e73620b73 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -235,6 +235,7 @@ ulli@morbus.(none) venu@hundin.mysql.fi venu@myvenu.com venu@work.mysql.com +vtkachenko@intelp4d.mysql.com vva@eagle.mysql.r18.ru vva@genie.(none) vva@mysql.r18.ru |