diff options
| author | unknown <timour@mysql.com> | 2004-11-25 11:37:28 +0200 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2004-11-25 11:37:28 +0200 |
| commit | 0dcb55f470a6540a005d9d812d0b7a3b1378bd2c (patch) | |
| tree | 29ad0385fdb639f58ab052e5bb498f9429a374d9 /BitKeeper/etc | |
| parent | 0c9f915ecbc46034ed648ce48daf57c89f1bb929 (diff) | |
| parent | 55ea7c8b0eb65d7834995774b1607011c0fd65f1 (diff) | |
| download | mariadb-git-0dcb55f470a6540a005d9d812d0b7a3b1378bd2c.tar.gz | |
Merge for BUG#3759 which was missing from the main tree for some reason.
BitKeeper/etc/logging_ok:
auto-union
sql/item_cmpfunc.h:
Auto merged
mysql-test/r/select.result:
Merge for BUG#3759
mysql-test/t/select.test:
Merge for BUG#3759
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ce1b4d16eb9..241b050d8f9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -9,6 +9,7 @@ acurtis@pcgem.rdg.cyberkinetica.com ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com antony@ltantony.dsl-verizon.net +antony@ltantony.rdg.cyberkinetica.homeunix.net arjen@bitbike.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com @@ -20,8 +21,10 @@ bar@mysql.com bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk +brian@brian-akers-computer.local carsten@tsort.bitbybit.dk davida@isil.mysql.com +dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com dlenev@mysql.com @@ -33,6 +36,7 @@ greg@mysql.com guilhem@mysql.com gweir@build.mysql.com gweir@work.mysql.com +hartmut@mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi heikki@rescue. @@ -43,7 +47,9 @@ hf@genie.(none) igor@hundin.mysql.fi igor@rurik.mysql.com ingo@mysql.com +jani@a193-229-222-105.elisa-laajakaista.fi jani@a80-186-24-72.elisa-laajakaista.fi +jani@a80-186-41-201.elisa-laajakaista.fi jani@dsl-jkl1657.dial.inet.fi jani@hynda.(none) jani@hynda.mysql.fi @@ -66,6 +72,7 @@ kostja@oak.local lenz@kallisto.mysql.com lenz@mysql.com marko@hundin.mysql.fi +matt@mysql.com miguel@hegel.(none) miguel@hegel.br miguel@hegel.local @@ -133,6 +140,7 @@ tim@bitch.mysql.fi tim@black.box tim@hundin.mysql.fi tim@sand.box +tim@siva.hindu.god tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com |