diff options
| author | unknown <jimw@mysql.com> | 2005-05-18 11:06:34 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-18 11:06:34 -0700 |
| commit | f8a20dbeb6d53fc5d993e088c245e4f2f9b085c5 (patch) | |
| tree | 384afb929b09dd50f92ab7de3d46902df3cb3e4e /BitKeeper | |
| parent | 6f7bccd1aca31045e2678159e2e931d2e94f54dd (diff) | |
| parent | d104149caf5d272a8495e4bd55ec9eaf3015b408 (diff) | |
| download | mariadb-git-f8a20dbeb6d53fc5d993e088c245e4f2f9b085c5.tar.gz | |
Resolve merge from 4.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
client/mysqldump.c:
Resolve merge
mysql-test/r/myisam.result:
Resolve merge
mysql-test/r/mysqldump.result:
Resolve merge
mysql-test/r/olap.result:
Resolve merge
mysql-test/r/subselect.result:
Resolve merge
mysql-test/t/myisam.test:
Resolve merge
mysql-test/t/mysqldump.test:
Resolve merge
mysql-test/t/olap.test:
Resolve merge
mysql-test/t/range.test:
Resolve merge
mysql-test/t/subselect.test:
Resolve merge
ndb/src/common/util/version.c:
Resolve merge
ndb/src/ndbapi/ndberror.c:
Resolve merge
sql/item.cc:
Resolve merge
sql/item_strfunc.h:
Resolve merge
sql/sql_select.cc:
Resolve merge
sql/sql_yacc.yy:
Resolve merge
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 31ed6abe28c..8e03cb3bad2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -282,6 +282,7 @@ tonu@x3.internalnet tsmith@build.mysql.com tulin@build.mysql.com tulin@dl145b.mysql.com +tulin@dl145c.mysql.com tulin@mysql.com ulli@morbus.(none) venu@hundin.mysql.fi |