kent@kent-amd64.(none)
d7286028c4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-04-11 01:50:06 +02:00
svoj@mysql.com/april.(none)
bcbcacb8da
BUG#24342 - Incorrect results with query over MERGE table
...
MERGE engine may return incorrect values when several representations
of equal keys are present in the index. For example "groß" and "gross"
or "gross" and "gross " (trailing space), which are considered equal,
but have different lengths.
The problem was that key length was not recalculated after key lookup.
Only MERGE engine is affected.
2007-04-11 01:40:35 +05:00
lars/lthalmann@dl145h.mysql.com
1e5d279451
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-04-10 18:26:14 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
904c75ede5
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-10 18:25:27 +02:00
msvensson@pilot.blaudden
6015d28386
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 18:20:27 +02:00
gkodinov/kgeorge@magare.gmz
9514ac9f29
Bug #19372 :
...
Added a test case.
The problem was fixed by the fix for bug #17379 .
The problem was that because of some conditions
the optimizer always preferred range or full index
scan access methods to lookup access methods even
when the latter were much cheaper.
2007-04-10 19:08:08 +03:00
msvensson@pilot.blaudden
610ff38ed9
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:33:21 +02:00
msvensson@pilot.blaudden
8d0755ba47
Update result(which mysterioulsy got lost)
2007-04-10 17:33:04 +02:00
jani@ua141d10.elisa.omakaista.fi
1e38c22ef8
Small fixes for merge.
2007-04-10 18:01:29 +03:00
gkodinov/kgeorge@magare.gmz
21a136883c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27659-5.0-opt
2007-04-10 16:57:46 +03:00
gkodinov/kgeorge@magare.gmz
aefc060fe5
Bug #27659 :
...
The optimizer transforms DISTINCT into a GROUP BY
when possible.
It does that by constructing the same structure
(a list of ORDER instances) the parser makes when
parsing GROUP BY.
While doing that it also eliminates duplicates.
But if a duplicate is found it doesn't advance the
pointer to ref_pointer array, so the next
(and subsequent) ORDER structures point to the wrong
element in the SELECT list.
Fixed by advancing the pointer in ref_pointer_array
even in the case of a duplicate.
2007-04-10 16:55:48 +03:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-10 16:28:47 +03:00
msvensson@pilot.blaudden
448a6778cb
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:59:46 +02:00
msvensson@pilot.blaudden
d549e4803a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:59:16 +02:00
msvensson@pilot.blaudden
f194cbe62a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 14:58:55 +02:00
msvensson@pilot.blaudden
4496a8f546
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:31:33 +02:00
msvensson@pilot.blaudden
34a784f3d0
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 13:51:32 +02:00
msvensson@pilot.blaudden
9f11d74cb0
Give the "sync_slave_with_master" something to do
2007-04-10 12:19:00 +02:00
msvensson@pilot.blaudden
6068275521
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 12:15:47 +02:00
msvensson@pilot.blaudden
7cf3a2a6a5
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 12:13:47 +02:00
gluh@mysql.com/eagle.(none)
6b2cb10a04
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.27069
2007-04-10 15:02:04 +05:00
gluh@mysql.com/eagle.(none)
b80d373b6a
Bug#27069 set with identical elements are created(additional fix)
...
issue an error in strict mode
if enum|set column has duplicates members in 'create table'
2007-04-10 15:01:04 +05:00
iggy@alf.
c33b299601
Merge alf.:D:/src/mysql-5.1-maint
...
into alf.:D:/src/mysql-5.1-maint_pt
2007-04-09 15:50:30 -04:00
bar@mysql.com
220c453194
Merge mysql.com:/home/bar/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-04-09 18:06:27 +05:00
bar@mysql.com
11ccfd80e6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b22648
2007-04-09 17:59:42 +05:00
bar@mysql.com
4341df8cf6
Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effect
...
Problem: setting/displaying @@LC_TIME_NAMES didn't distinguish between
GLOBAL and SESSION variable types - always SESSION variable
was set/shonw.
Fix: set either global or session value.
Also, "mysqld --lc-time-names" was added to set "global default" value.
2007-04-09 17:58:56 +05:00
bar@mysql.com
9faaec9e1b
bug#27608 XML output is not well-formed
...
Problem: output was empty if the result is empty.
Fix: print XML header and footer, even if the result
is empty, to produce well-formed XML output.
2007-04-09 17:53:10 +05:00
holyfoot/hf@hfmain.(none)
26d2908c70
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:46:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
bd461b01f0
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:45:14 +05:00
holyfoot/hf@hfmain.(none)
33ed2ead2a
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:07:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
65535824ba
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:06:28 +05:00
kent@kent-amd64.(none)
a16289d550
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
2007-04-08 20:48:07 +02:00
kent@mysql.com/kent-amd64.(none)
c282dd3715
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
2007-04-08 20:46:40 +02:00
evgen@moonbone.local
d8e6b38ec1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 23:09:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
171f8badd7
merging fix
2007-04-08 00:05:34 +05:00
Kristofer.Pettersson@naruto.
7d3c4c29da
Merge naruto.:C:/cpp/bug26121/my51-bug26121
...
into naruto.:C:/cpp/mysql-5.1-runtime
2007-04-07 21:03:35 +02:00
joerg@trift2.
22f066e354
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
joerg@trift2.
d77ab7a009
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
7ceefd2b3f
after-merging fix
2007-04-07 23:16:03 +05:00
holyfoot/hf@hfmain.(none)
6ffa4b9c84
Merge mysql.com:/home/hf/work/26074/my51-26074
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 16:36:50 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
2a5bcc3f3e
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:36:02 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
4a82c460a6
test temporarily disabled
2007-04-07 11:31:49 +05:00
kent/kboortz@production.mysql.com
9d380a2c29
Merge mysql.com:/tmp/mysql-5.0-build
...
into mysql.com:/tmp/mysql-5.1-build
2007-04-07 04:22:19 +02:00
tomas@whalegate.ndb.mysql.com
254ad34300
disabled test and feature
2007-04-07 00:28:09 +02:00
evgen@moonbone.local
c3d9eeb25c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 00:56:35 +04:00
evgen@moonbone.local
93c29c10b1
Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
...
NO_AUTO_VALUE_ON_ZERO mode.
The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.
The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
2007-04-07 00:13:27 +04:00
tomas@whalegate.ndb.mysql.com
d62346a45f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 20:47:40 +02:00