anozdrin/alik@ibm.
e5ed653e16
Fix merge.
2008-01-20 00:59:24 +03:00
anozdrin/alik@ibm.
58f76a036d
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.0-rt
2008-01-20 00:39:14 +03:00
anozdrin/alik@ibm.
baf5f73853
Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
2008-01-19 22:32:48 +03:00
anozdrin/alik@ibm.
3cd05f003e
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0
...
into ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-merged-5.0
2008-01-19 21:28:21 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
c6a01870bc
Raise version number after cloning 5.1.23-rc
2008-01-19 12:39:49 +01:00
kostja@dipika.(none)
8aa978352e
A minor cleanup.
2008-01-16 16:44:07 +03:00
davi@mysql.com/endora.local
30267c7750
Post merge fix for BUG 33728
2008-01-11 21:34:23 -02:00
davi@endora.local
ec5c26f8d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-01-11 20:42:07 -02:00
davi@mysql.com/endora.local
e88edf6ab1
Bug#33728 Atomic builtins
...
Use compiler provided atomic builtins as a 'backend' for
MySQL's atomic primitives. The builtins are available on
a handful of platforms and compilers.
2008-01-11 20:34:36 -02:00
thek@adventure.(none)
77569d6708
Fixed faulty test case caused by race condition.
2008-01-11 14:16:46 +01:00
kaa@kaamos.(none)
0ef58cfe6b
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 22:33:29 +03:00
kaa@kaamos.(none)
0cec5f8e4b
Merge kaamos.(none):/data/src/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 20:44:23 +03: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
epotemkin@bk-internal.mysql.com
a714053711
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2008-01-10 18:03:26 +01: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
kaa@kaamos.(none)
e11a62776d
Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.
2008-01-10 15:07:55 +03:00
kaa@kaamos.(none)
36773c170d
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 14:35:11 +03: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)
df8832bbea
Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 13:46:34 +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
kaa@kaamos.(none)
8db61db7e1
Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305
...
into kaamos.(none):/data/src/opt/bug33305/my51-bug33305
2008-01-10 13:37:54 +03: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@macbook.gmz
76c0aefcc2
merge of the fix for bug 33133 to 5.1-opt
2008-01-09 18:00:12 +02:00
gkodinov/kgeorge@macbook.gmz
83012461f0
Merge macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.1-opt
2008-01-09 17:10:09 +02: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
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
davi@mysql.com/endora.local
025aadce8a
Bug#29770 Two handlers are allowed to catch an error in an stored procedure.
...
Add test case.
2008-01-08 18:43:25 -02:00
gkodinov/kgeorge@macbook.gmz
5b9e61b282
merge of bug 33256 5.0-opt -> 5.1-opt
2008-01-08 12:27:15 +02:00
gkodinov/kgeorge@macbook.gmz
2710053416
Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt
2008-01-08 11:49:40 +02:00
thek@adventure.(none)
3cd3a40d4d
Fixed test layout error.
2008-01-07 21:06:18 +01: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
thek@adventure.(none)
2a499f757d
Merge adventure.(none):/home/thek/Development/cpp/bug30887/my51-bug30887
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-01-03 15:37:54 +01:00
thek@adventure.(none)
96146a392f
Bug#30887 Server crashes on SET GLOBAL query_cache_size=0
...
Reseting the query cache by issuing a SET GLOBAL query_cache_size=0 caused the server
to crash if a the server concurrently was saving a new result set to the query cache. The
reason for this was that the invalidation wasn't waiting on the result writers to
release the block level locks on the query cache.
2008-01-03 15:36:48 +01: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
mhansson/martin@linux-st28.site
8b65423d9d
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848
2007-12-21 14:52:39 +01:00
joerg@trift2.
a0fbcc0326
Merge trift2.:/MySQL/M50/merge-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-12-21 13:13:22 +01:00
joerg@trift2.
9f96125023
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-21 12:53:05 +01: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
bea1bfd5c7
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-12-21 09:44:08 +01: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
dkatz@damien-katzs-computer.local
4b8c6e4913
Bug #29836 enable-pstack option appears even if --with-pstack is disabled
...
Placed all pstack code inside of #ifdef's, so the options aren't displayed when not available.
2007-12-20 15:32:56 -05:00
brian@zim.(none)
97e3c6cbf4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/bk/mysql-5.1-arch
2007-12-20 12:32:16 -08:00
brian@zim.(none)
4316829b75
client_priv.h:
...
Removed dead option
mysqlslap.c:
Updates from Paul for help.
Removed dead option
2007-12-20 12:23:35 -08:00
kostja@bodhi.(none)
dfe685e6fc
A pre-requisite for the fix for Bug#12713 "Error in a stored function
...
called from a SELECT doesn't cause ROLLBACK of state"
Make private all class handler methods (PSEA API) that may modify
data. Introduce and deploy public ha_* wrappers for these methods in
all sql/.
This necessary to keep track of all data modifications in sql/,
which is in turn necessary to be able to optimize two-phase
commit of those transactions that do not modify data.
2007-12-20 21:16:55 +03:00
mhansson/martin@linux-st28.site
fe93176c30
Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gca
...
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848-gca
2007-12-20 14:19:52 +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