istruewing@stella.local
0eff6e7be5
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-26 10:51:16 +01:00
istruewing@stella.local
44fbe74e1e
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-26 10:27:00 +01:00
istruewing@stella.local
c82b842ad8
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-03-26 09:34:37 +01:00
istruewing@stella.local
fde9b55d61
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-03-26 09:33:55 +01:00
msvensson@pilot.mysql.com
201ce48d5d
After merge fixes
2008-03-26 07:22:42 +01:00
malff@lambda.hsd1.co.comcast.net.
2dbcef2538
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-8759
2008-03-25 17:49:47 -06:00
malff@lambda.hsd1.co.comcast.net.
f8d0d4d97c
Manual merge
2008-03-25 17:48:05 -06:00
malff@lambda.hsd1.co.comcast.net.
56f893cc96
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-opt
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-opt-merge
2008-03-25 17:35:34 -06:00
istruewing@stella.local
97531cadc9
Bug#35559 - plugin_load.test creates warnings
...
plugin_load.test created lines in the warnings files and made
pushbuild cells yellow. Some pushbuild systems are configured
so that they don't build the ha_example plugin. Trying to load
them creates error messages in the error log. These were copied
to the warnings file.
Fixed by ignoring expected error messages for non-existent
ha_example.
2008-03-25 21:30:45 +01:00
anozdrin/alik@quad.opbmk
a1eab6ee8b
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-03-25 23:09:05 +03:00
davi@mysql.com/endora.local
079a174801
Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash
...
When trying to get the requested amount of memory for the keybuffer,
the out of memory could be signaled if one of the tentative allocations
fail. Later the server would crash (debug assert) when trying to send
a ok packet with a error set.
The solution is only to signal the error if all tentative allocations
for the keybuffer fail.
2008-03-25 15:53:57 -03:00
msvensson@pilot.mysql.com
bc4874b79c
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-03-25 18:40:49 +01:00
malff@lambda.hsd1.co.comcast.net.
0a2e401c0a
Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
...
instructions)
This bug can not be reproduced in the current version,
adding the test case to the test suite for coverage, no code change.
2008-03-25 11:20:11 -06:00
svoj@june.mysql.com
2d44db25e7
Merge mysql.com:/home/svoj/devel/mysql/BUG35509/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG34768/mysql-5.1-engines
2008-03-25 20:28:43 +04:00
andrey@whirlpool.hristov.com
36b83cc865
Fix for Bug #27944 Filtering THD::client capabilities
...
The server used to trust blindly information from the client about
its capabilities. During the connection handshake the server sends
information about what it supports and then the client sends back a
set of capabilities which cover all of the server's or less.
Before this changeset the server didn't check whether the flags sent
by the client were valid for the server. For example, if the server
doesn't support compressed protocol but the client does and sends that
bit turned on, the server didn't check it. The change make the server code
less error prone to problems related to the value of THD::client_capabilities.
Clearly there is no vulnerability being fixed but this is a maintainenance
fix to prevent misusage in the future.
2008-03-25 18:18:58 +02:00
gshchepa/uchum@host.loc
2a3cc7f350
Merge host.loc:/home/uchum/work/5.0-opt
...
into host.loc:/home/uchum/work/5.1-opt
2008-03-25 19:49:27 +04:00
gshchepa/uchum@host.loc
1eb00401f4
information_schema.test, information_schema.result:
...
Minor test case cleanup after bug#34529.
2008-03-25 19:44:27 +04:00
msvensson@pilot.mysql.com
dfa3be4944
Bug#34761 Mysql-test-run.pl script hangs on Windows
2008-03-25 16:29:32 +01:00
msvensson@pilot.mysql.com
69a755d6a0
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-03-25 16:28:02 +01:00
msvensson@pilot.mysql.com
06c73d7d1c
Bug#34761 Mysql-test-run.pl script hangs on Windows
2008-03-25 16:27:23 +01:00
msvensson@pilot.mysql.com
3748684396
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-03-25 16:02:06 +01:00
joerg@trift2.
9ed9e12ff4
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-03-25 15:36:23 +01:00
joerg@trift2.
e58f029f9e
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-03-25 15:34:23 +01:00
joerg@trift2.
99ae3b8ad0
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-03-25 15:24:24 +01:00
mkindahl@dl145h.mysql.com
bc683c6450
Eliminating compiler warnings.
2008-03-25 15:20:42 +01:00
svoj@mysql.com/june.mysql.com
88247fd271
BUG#34789 - drop server/create server leaks memory !
...
BUG#34790 - 'create server' doesn't handle out of memory scenario
well enough
This is an addition to fixes for these bugs, which makes gcov
happy.
2008-03-25 17:37:53 +04:00
svoj@mysql.com/june.mysql.com
b799ea244c
BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode
...
if binlog_format=mixed
Addition to fix for BUG#34768: fixed test case failures discovered
by pushbuild.
2008-03-25 17:28:12 +04:00
joerg@trift2.
099ef6694c
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-03-25 14:09:16 +01:00
anozdrin/alik@quad.opbmk
6e09515a82
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-03-25 14:54:48 +03:00
anozdrin/alik@quad.opbmk
1298b1f3c0
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-03-25 14:54:08 +03:00
anozdrin/alik@quad.opbmk
c941b9f349
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0
...
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
2008-03-25 14:53:23 +03:00
svoj@mysql.com/june.mysql.com
f064cd84d5
BUG#35509 - Federated leaks memory when connecting to
...
localhost/default port
When creating federated table that points to unspecified host or
localhost on unspecified port or port is 0, small memory leak occurs.
This happens because we make a copy of unix socket path, which is
never freed.
With this fix we do not make a copy of unix socket path, instead
share->socket points to MYSQL_UNIX_ADDR constant directly.
This fix is covered by a test case for BUG34788.
Affects 5.0 only.
2008-03-25 12:47:57 +04:00
msvensson@pilot.mysql.com
cd23635d9e
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-mvt
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-03-25 09:26:00 +01:00
msvensson@pilot.mysql.com
9201ff3c36
Find mysqld binary from it's basedir
2008-03-25 09:19:03 +01:00
davi@mysql.com/endora.local
ef728577a2
Patch for bug 28386 enabled table logging for all tests in
...
mysql_client_test causing a severe slowdown and increase
in memory usage, especially for test cases with long queries.
The solution is to enable the general log only in tests that
actually need the general log and disable it during the
execution of all other tests.
2008-03-24 22:39:48 -03:00
mhansson/autopush@riffraff.(none)
13d3e8af83
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into riffraff.(none):/data0/autopush/my50-bug34529
2008-03-24 16:19:50 +01:00
gkodinov/kgeorge@magare.gmz
53f34e0cd7
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/warnings-5.1-opt
2008-03-24 09:10:20 +02:00
holyfoot/hf@hfmain.(none)
0b9d543a6d
Merge mysql.com:/home/hf/work/33334/my50-33334
...
into mysql.com:/home/hf/work/33334/my51-33334
2008-03-23 21:57:36 +04:00
holyfoot/hf@hfmain.(none)
0440eb7798
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/33334/my51-33334
2008-03-23 21:55:02 +04:00
holyfoot/hf@hfmain.(none)
28b8fa10a8
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/33334/my50-33334
2008-03-23 21:53:36 +04:00
holyfoot/hf@hfmain.(none)
766998684d
Merge mysql.com:/home/hf/work/33334/my50-33334
...
into mysql.com:/home/hf/work/33334/my51-33334
2008-03-23 20:35:00 +04:00
gkodinov/kgeorge@macbook.gmz
ba2ba4548d
merge bug 26461 to 5.1-opt
2008-03-23 14:29:35 +02:00
anozdrin/alik@quad.opbmk
bb7a9a008c
Fix for Bug#34274: Invalid handling of 'DEFAULT 0'
...
for YEAR data type.
The problem was that for some unknown reason 0 was not allowed
as a default value for YEAR data type. That was coded before BK.
However the Manual does not say a word about such a limitation.
Also, it looks inconsistent with other data types.
The fix is to allow 0 as a default value.
2008-03-22 11:32:24 +03:00
anozdrin/alik@quad.opbmk
032428428c
Fix result files (Bug#21854).
2008-03-22 11:01:31 +03:00
kent@kent-amd64.(none)
6968235df8
Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
...
into mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-03-22 01:47:05 +01:00
kent@kent-amd64.(none)
84705d2632
Merge mysql.com:/home/kent/bk/build/mysql-4.1-build
...
into mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-03-22 01:43:13 +01:00
kent@mysql.com/kent-amd64.(none)
fd97c5c947
Merge mysql.com:/home/kent/bk/mysql-4.1-release
...
into mysql.com:/home/kent/bk/build/mysql-4.1-build
2008-03-22 01:29:27 +01:00
malff@lambda.hsd1.co.comcast.net.
7da456ca01
Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)
...
Fixed the parser to reject SQLSTATE '00000',
since '00000' is the successful completion condition,
and can not be caught by an exception handler in SQL.
2008-03-21 12:08:04 -06:00
gkodinov/kgeorge@magare.gmz
f6871c0d66
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
2008-03-21 17:48:28 +02:00
anozdrin/alik@quad.opbmk
1b8fb7733a
A patch for Bug#21854: Problems with CREATE TRIGGER without
...
DEFINER clause in --skip-grant-tables mode.
Update error message.
2008-03-21 18:34:12 +03:00