tomas@whalegate.ndb.mysql.com
b422aed975
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-01-23 15:07:18 +01:00
tomas@whalegate.ndb.mysql.com
74959eed0d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-01-23 14:55:37 +01:00
tomas@whalegate.ndb.mysql.com
c4f4cdd83b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
2008-01-23 14:41:06 +01:00
jonas@perch.ndb.mysql.com
f4d6dd7135
Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/50-ndb
2008-01-23 13:04:36 +01:00
jonas@perch.ndb.mysql.com
68b5382a60
ndb - bug#34005
...
make sure whole send buffer is flushed, even when wrapping around end
2008-01-23 12:56:27 +01:00
jonas@perch.ndb.mysql.com
c9485283c7
Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/50-ndb
2008-01-23 10:04:12 +01:00
jonas@perch.ndb.mysql.com
88dc7e9d76
ndb - bug#33750
...
make sure that getField does not write after supplied buffer
(recommit to correct clone, for easy merging)
2008-01-23 09:59:06 +01:00
kaa@kaamos.(none)
f8ade5e91b
Merge kaamos.(none):/data/src/mysql-5.0
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-01-10 20:43:05 +03:00
evgen@moonbone.local
7f933eb3e0
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/33675-bug-5.0-opt-mysql
2008-01-10 19:23:36 +03:00
evgen@moonbone.local
830b8f0e30
filesort.cc:
...
Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
server crash.
Free smaller buffer before allocating bigger one.
2008-01-10 18:54:34 +03:00
gni@dev3-221.dev.cn.tlan
0b1d727be7
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj
2008-01-10 20:04:21 +08:00
kaa@kaamos.(none)
6e60a185d3
Merge kaamos.(none):/data/src/opt/mysql-4.1-opt
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-01-10 14:01:25 +03:00
kaa@kaamos.(none)
749157d66e
Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-01-10 13:45:11 +03:00
gni@dev3-221.dev.cn.tlan
b5368c1b9a
Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298
2008-01-10 13:51:09 +08:00
evgen@moonbone.local
165dfa3eba
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/33675-bug-5.0-opt-mysql
2008-01-09 23:19:46 +03:00
gkodinov/kgeorge@magare.gmz
5a01be841a
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B33133-5.0-opt
2008-01-09 16:52:11 +02:00
gkodinov/kgeorge@macbook.gmz
2fc45f017d
Bug #33133 : Views are not transparent
...
When resolving references we need to take into consideration
the view "fields" and allow qualified access to them.
Fixed by extending the reference resolution to process view
fields correctly.
2008-01-09 16:49:13 +02:00
gni@dev3-221.dev.cn.tlan
9ca2177b2e
Fix for view.test.
...
the result should be added by 1 by the year(now()) function.
2008-01-09 14:51:08 +08:00
gni@dev3-221.dev.cn.tlan
37a64e5cbf
Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug29851
2008-01-09 11:17:50 +08:00
evgen@moonbone.local
ce111a0d73
Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
...
server crash.
The filesort implementation has an optimization for subquery execution which
consists of reusing previously allocated buffers. In particular the call to
the read_buffpek_from_file function might be skipped when a big enough buffer
for buffer descriptors (buffpeks) is already allocated. Beside allocating
memory for buffpeks this function fills allocated buffer with data read from
disk. Skipping it might led to using an arbitrary memory as fields' data and
finally to a crash.
Now the read_buffpek_from_file function is always called. It allocates
new buffer only when necessary, but always fill it with correct data.
2008-01-09 00:40:41 +03:00
gkodinov/kgeorge@magare.gmz
7fe932ed82
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt
2008-01-07 18:55:05 +02:00
kaa@polly.(none)
578b3632cc
Fix for bug #33305 : Test case in 'skip_grants' file need dynamic loading
...
to be compiled in
The problem was that on a statically built server an attempt to create
a UDF resulted in a different, but reasonable error ("Can't open shared
library" instead of "UDFs are unavailable with the --skip-grant-tables
option"), which caused a failure for the test case for bug #32020 .
Fixed by moving the test case for bug #32020 from skip_grants.test to a
separate test to ensure that it is only run when the server is built
with support for dynamically loaded libraries.
2007-12-24 17:42:13 +03:00
joerg@trift2.
bf1ba3d416
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/merge-5.0
2007-12-21 12:48:14 +01:00
gkodinov/kgeorge@macbook.gmz
e4efb4a521
Bug #33256 : CREATE ... SELECT creates obsolete table
...
w/ Field_date instead of Field_newdate
Field_date was still used in temp table creation.
Fixed by using Field_newdate consistently throughout the server
except when reading tables defined with older MySQL version.
No test suite is possible because both Field_date and Field_newdate
return the same values in all the metadata calls.
2007-12-21 12:44:24 +02:00
df@pippilotta.erinye.com
f25c6ffaee
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-21 09:40:53 +01:00
df@pippilotta.erinye.com
f7527b7856
BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump
2007-12-20 21:37:21 +01:00
tnurnberg@white.intern.koehntopp.de
22d1a50d5c
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31990/50-31990
2007-12-20 13:42:50 +01:00
mhansson/martin@linux-st28.site
284d8c71ee
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
2007-12-20 11:24:42 +01:00
mhansson/martin@linux-st28.site
6f6e18809a
Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38
...
Warnings elimination
2007-12-20 10:58:21 +01:00
tnurnberg@white.intern.koehntopp.de
d1637b2ec4
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31990/50-31990
2007-12-20 08:35:52 +01:00
mhansson/martin@linux-st28.site
0004b99b58
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
2007-12-19 15:59:05 +01:00
gkodinov/kgeorge@magare.gmz
1a8b8eb91c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
2007-12-18 10:45:05 +02:00
tomas@whalegate.ndb.mysql.com
a021330f79
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-18 07:13:59 +01:00
df@pippilotta.erinye.com
92de4d5e78
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-17 19:08:55 +01:00
gkodinov/kgeorge@magare.gmz
695342d676
Bug #19390 : Test 'rpl_trigger' fails, might be random
...
The checks in the test for bug #12480 were too wide and
made the test to depend on the procedures and triggers
present in the server.
Corrected the test to check only for the procedure and
trigger it creates.
2007-12-17 18:56:39 +02:00
tnurnberg@white.intern.koehntopp.de
e6fc773b43
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32770/50-32770
2007-12-17 16:16:39 +01:00
tnurnberg@white.intern.koehntopp.de
977a189e24
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 14:17:18 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b89fabe164
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 14:06:15 +01:00
joerg@trift2.
7bd4ac4df7
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-12-17 13:36:17 +01:00
tnurnberg@white.intern.koehntopp.de
5016d16507
Merge mysql.com:/misc/mysql/31752_/41-31752_
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 12:10:26 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e
Bug#31752: check strmake() bounds
...
fix test program
2007-12-17 12:09:21 +01:00
tnurnberg@white.intern.koehntopp.de
1d84609890
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32770/50-32770
2007-12-17 09:56:40 +01:00
tnurnberg@white.intern.koehntopp.de
f7aa719268
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 09:45:36 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b2f867155f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 09:42:55 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
e131a41281
Merge mysql.com:/misc/mysql/31752_/41-31752_
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 09:13:38 +01:00
tnurnberg@white.intern.koehntopp.de
2ab88382ef
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32770/50-32770
2007-12-17 07:54:32 +01:00
mhansson/martin@linux-st28.site
ca5f50788e
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push
2007-12-15 16:45:21 +01:00
kostja@bodhi.(none)
4bb503568d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-12-15 17:00:18 +03:00
mhansson/martin@linux-st28.site
59314ee35b
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push
2007-12-15 12:07:33 +01:00
mhansson/martin@linux-st28.site
bcfdd27481
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push
2007-12-15 12:02:33 +01:00