diff options
| author | unknown <jimw@mysql.com> | 2004-12-03 00:39:55 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2004-12-03 00:39:55 +0100 |
| commit | 117c7611a74ec27cf2f136b14155d29880613c74 (patch) | |
| tree | 53ebea55676a1cbab3ffb260b9f465ae28508351 /BitKeeper | |
| parent | 5fc09be9a36cdd98691ff109788c2c5b0a9a2c69 (diff) | |
| parent | 9286d1c1452d53dd36c94fbe94a3f99be7b1dfb2 (diff) | |
| download | mariadb-git-117c7611a74ec27cf2f136b14155d29880613c74.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/t/insert_select.test:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/insert_select.result:
SCCS merged
sql/sql_insert.cc:
merge changes
sql/sql_table.cc:
e
merge changes
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 00f4c86d319..b8043910a11 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -87,6 +87,7 @@ jcole@mugatu.jcole.us jcole@mugatu.spaceapes.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com +jimw@mysql.com joerg@mysql.com joreland@mysql.com jorge@linux.jorge.mysql.com |