tomas@whalegate.ndb.mysql.com
3c0e6e3983
missing return
2007-04-11 19:29:32 +02:00
tomas@whalegate.ndb.mysql.com
06acade5c2
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-11 18:11:14 +02:00
tomas@whalegate.ndb.mysql.com
dd4351e96f
Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
...
- try to catch as many malloc failures as possible and give error messages
2007-04-11 15:21:11 +02:00
df@pippilotta.erinye.com
42499a4713
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:57:52 +02:00
df@pippilotta.erinye.com
f98d1614c3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:32:40 +02:00
df@pippilotta.erinye.com
b51c346781
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1
make configure handle service pack version strings
2007-04-11 13:01:11 +02: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
jonas@perch.ndb.mysql.com
e0a4d1b4c7
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-04-11 08:28:09 +02:00
jonas@perch.ndb.mysql.com
d76e039ae7
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-04-11 08:26:52 +02:00
jonas@perch.ndb.mysql.com
bb1adff862
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-04-11 08:26:23 +02:00
jonas@perch.ndb.mysql.com
4954962388
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2007-04-11 08:24:11 +02:00
jonas@perch.ndb.mysql.com
f52b0e3768
ndb - bug#27748
...
fix commit trigger on multi-update
2007-04-11 08:23:16 +02:00
kent@mysql.com/kent-amd64.(none)
c92faf9d61
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
2007-04-11 01:51:33 +02: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
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf
my_memmem.c:
...
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
Use separate libtool convenience library for the bundled
zlib to embed into executables and shared libraries created,
and one to install into the pkglib directory
2007-04-11 01:47:42 +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
df@pippilotta.erinye.com
05f4e9ea05
BUG#27701 Arguments to some compile-pentium* scripts were not properly passed to SETUP.sh. Besides the old way not working with some shells, single arguments that contained whitespace were also broken up. This patch tries to fix both errors.
2007-04-10 17:50:43 +02: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
msvensson@pilot.blaudden
3d847358de
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6
Take into account wether vertical_results are in effect
2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4
Init dying to 1 just after passing the guard
2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895
Add OPT_LOG_DIR
2007-04-10 17:05:22 +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
jani@ua141d10.elisa.omakaista.fi
2ead71eebc
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
2007-04-10 16:37:20 +03:00
serg@janus.mylan
102f58fe34
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
2007-04-10 15:27:26 +02:00
serg@janus.mylan
1c678b34aa
Bug#27171 mysqlbinlog produces different output depends from option -R
...
a better fix, that works with 4.1 servers which don't send a fake
Format_description_log_event.
2007-04-10 15:26:35 +02:00
msvensson@pilot.blaudden
c30b68805c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 15:03:22 +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
829ca34daf
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:46:57 +02:00
msvensson@pilot.blaudden
5c5271754b
Add --logdir option ot mysqltest
2007-04-10 14:45:13 +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