tomas@whalegate.ndb.mysql.com
ec6476cbef
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-11 20:30:23 +02:00
tomas@whalegate.ndb.mysql.com
b86f256d24
remove warning
2007-04-11 20:22:31 +02:00
tomas@whalegate.ndb.mysql.com
537af12420
correct merge error
2007-04-11 19:38:29 +02:00
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
deec4449ac
Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
...
- try to catch as many malloc failures as possible and give error messages
(more for 5.1)
2007-04-11 18:10:45 +02:00
tomas@whalegate.ndb.mysql.com
da1ebc7fce
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-11 15:51:09 +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
6d70fd8751
don't copy pdb files from the release target output folder, since this target does not build them
2007-04-11 14:27:03 +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
e3bfb95665
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-11 13:49:04 +02:00
df@pippilotta.erinye.com
d09d2517cf
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.1-build-work
2007-04-11 13:37:05 +02:00
df@pippilotta.erinye.com
4869a255be
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-11 13:33:15 +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
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
aba4abea1b
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-11 08:25:26 +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
df@pippilotta.erinye.com
7bff5112cc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-11 08:06:36 +02:00
jonas@perch.ndb.mysql.com
d5f665ce5b
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-11 07:59:26 +02:00
jonas@perch.ndb.mysql.com
382b2fa9ae
ndb - bug#27748
...
testcase
2007-04-11 07:56:11 +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@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
kent@kent-amd64.(none)
473b1f31d5
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-04-11 01:48:43 +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
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
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
df@pippilotta.erinye.com
5197d7712c
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-10 13:15:07 +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
df@pippilotta.erinye.com
8e7e7d6b37
add a manual page back
2007-04-10 11:31:45 +02:00
jonas@perch.ndb.mysql.com
9696d5b465
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-10 10:30:22 +02:00
jonas@perch.ndb.mysql.com
8723380db2
ndb -
...
add event log listener test tool
2007-04-10 10:27:02 +02:00
jonas@perch.ndb.mysql.com
6dca65b57b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-10 10:22:55 +02:00
jonas@perch.ndb.mysql.com
406620d71d
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-10 10:16:07 +02:00
jonas@perch.ndb.mysql.com
cd3c4a9786
ndb - bug#27651 (5.1)
...
Only prepare "next" GCI if we're in the first 4 highest GCI's
to avoid we can get several buckets with same GCI
2007-04-10 10:15:35 +02:00
jonas@perch.ndb.mysql.com
d2225f0894
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-10 10:06:04 +02:00
jonas@perch.ndb.mysql.com
ee4a94a0c1
ndb - bug#27728 (5.1)
...
Make sure API is connected to nodes when subscribing
2007-04-10 10:05:01 +02: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)
87daef26a6
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:16:05 +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