diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:02:16 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:02:16 +0300 |
| commit | 5a3c12effb4a0d32bf6b77d4b19edcf1757bb823 (patch) | |
| tree | 1dd88e8c946c87dfaa131fd495d71766127a0e94 /BitKeeper | |
| parent | 23a9a5805cd258c5699e782cebdb5763acb1d85d (diff) | |
| parent | 1726ae86be52bc129b5788406d60808b15b8bd9f (diff) | |
| download | mariadb-git-5a3c12effb4a0d32bf6b77d4b19edcf1757bb823.tar.gz | |
Merge with 3.23 tree to get latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/nt_servc.cc:
Auto merged
configure.in:
Use local version
innobase/os/os0file.c:
Use local version
innobase/page/page0page.c:
Use local version
innobase/row/row0sel.c:
Use local version
innobase/row/row0vers.c:
Use local version
mysql-test/r/order_by.result:
Use local version
mysql-test/r/user_var.result:
merge with 3.23
mysql-test/t/order_by.test:
Use local version (test is already in range.test)
sql/log.cc:
Use local version
sql/share/spanish/errmsg.txt:
merge
sql/slave.cc:
Use local version
sql/sql_class.h:
Use local version
sql/sql_select.cc:
Use patch in 4.0 for range with NULL problem
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 89f03d96369..be9d7b77650 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -17,6 +17,7 @@ bk@admin.bk davida@isil.mysql.com gluh@gluh.(none) gluh@gluh.mysql.r18.ru +greg@gcw.ath.cx greg@mysql.com guilhem@mysql.com gweir@work.mysql.com @@ -49,6 +50,7 @@ miguel@hegel.br miguel@hegel.local miguel@light. miguel@light.local +miguel@sartre.local mmatthew@markslaptop. monty@bitch.mysql.fi monty@butch. |