jani@ua141d10.elisa.omakaista.fi
335153121b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-04-12 12:50:02 +03:00
tomas@whalegate.ndb.mysql.com
f9a900f80e
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
...
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
2007-04-12 11:07:30 +02:00
msvensson@pilot.blaudden
cd2f78fdd8
Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect
...
- Add testcase for SSL connection from mysqldump to mysqld
2007-04-11 23:42:53 +02:00
igor@olga.mysql.com
4bf11f99eb
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-11 13:48:02 -07:00
igor@olga.mysql.com
e1efba0225
Post-merge fix.
2007-04-11 12:45:27 -07:00
msvensson@pilot.blaudden
900e0d685d
Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-11 21:03:29 +02:00
msvensson@pilot.blaudden
e81cb86952
Add test for connect using different ssl ciphers
2007-04-11 21:01:10 +02:00
igor@olga.mysql.com
3b990d2cf4
Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-11 11:57:40 -07:00
igor@olga.mysql.com
520b144007
Fixed bug #27484 : a crash when incompatible row expressions with nested rows
...
are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().
2007-04-11 11:41:12 -07:00
gkodinov/kgeorge@magare.gmz
4202454baa
Bug #27530 :
...
The function CRC32() returns unsigned integer.
But the metadata (the unsigned flag) for the
function was set incorrectly.
As a result type arithmetics based on the
function's metadata (like finding the concise
type of an temporary table column to hold the result)
returned incorrect results.
Fixed by returning correct type information.
This fix is based on code contributed by Martin Friebe
(martin@hybyte.com ) on 2007-03-30.
2007-04-11 13:58:16 +03:00
msvensson@pilot.blaudden
4e17e06a5b
Add replace_result for things that are not tested
2007-04-11 09:06:27 +02:00
gkodinov/kgeorge@magare.gmz
4aeb1c896e
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B19372-5.0-opt
2007-04-11 09:37:01 +03:00
kent@mysql.com/kent-amd64.(none)
7e02bed924
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
2007-04-11 01:50:58 +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@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
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
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
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
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
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
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@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@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@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
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
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
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
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d0e79056b1
Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
2007-04-06 18:07:02 +00:00
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02:00
hhunger@hh-nb.hungers
df469af549
test of row locking.
2007-04-05 16:04:31 +02:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
a858e44a9d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:20:56 +02:00
mskold/marty@mysql.com/linux.site
bcac914163
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 09:18:37 +02:00
tomas@whalegate.ndb.mysql.com
ffba52433c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 09:18:36 +02:00
tomas@whalegate.ndb.mysql.com
292929bc26
Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
...
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00