diff options
| author | unknown <bar@mysql.com> | 2005-03-05 18:20:35 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-03-05 18:20:35 +0400 |
| commit | e7eac0274ba17953f413e9077226a2246028c5bd (patch) | |
| tree | 7975cf16834c464fd8132f9adfa4cf79235cae5c /BitKeeper | |
| parent | 0d7e68c92a4ded30d02a66b434cbe624c3df5e1e (diff) | |
| parent | f1c81bf66960527140d6fe4251ded1a818a3a45e (diff) | |
| download | mariadb-git-e7eac0274ba17953f413e9077226a2246028c5bd.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
innobase/trx/trx0trx.c:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/func_system.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/opt_sum.cc:
Auto merged
innobase/ut/ut0mem.c:
e
merge from 4.1
mysql-test/r/func_group.result:
merge from 4.1
mysql-test/r/func_str.result:
merge from 4.1
mysql-test/t/func_group.test:
merge from 4.1
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 89e1ff4bd48..ec66e9ef2eb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -71,6 +71,7 @@ hf@deer.(none) hf@deer.mysql.r18.ru hf@genie.(none) igor@hundin.mysql.fi +igor@linux.local igor@rurik.mysql.com ingo@mysql.com jan@hundin.mysql.fi |