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
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
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
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
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
gshchepa/uchum@host.loc
9b6f0f3a79
Merge host.loc:/home/uchum/work/PA/5.0-opt-34763
...
into host.loc:/home/uchum/work/5.1-opt
2008-03-20 00:30:37 +04:00
gshchepa/uchum@host.loc
e57eaf0cef
Merge host.loc:/home/uchum/work/PA/5.0-opt-34763
...
into host.loc:/home/uchum/work/5.0-opt
2008-03-20 00:29:50 +04:00
mhansson/martin@riffraff.(none)
86db2a0cd5
Bug#34529: Crash on complex Falcon I_S select after ALTER .. PARTITION BY
...
When swapping out heap I_S tables to disk, this is done after plan refinement.
Thus, READ_RECORD::file will still point to the (deleted) heap handler at start
of execution. This causes segmentation fault if join buffering is used and the
query is a star query where the result is found to be empty before accessing
some table. In this case that table has not been initialized (i.e. had its
READ_RECORD re-initialized) before the cleanup routine tries to close the handler.
Fixed by updating READ_RECORD::file when changing handler.
2008-03-19 14:32:28 +01:00
kaa@kaamos.(none)
cf68ce0fbf
Merge kaamos.(none):/data/src/opt/bug34512/my51
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-19 16:31:26 +03:00
kaa@kaamos.(none)
a7d92c9879
Merge kaamos.(none):/data/src/opt/bug34512/my50
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-03-19 16:30:56 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
635b44f19b
Bug #33334 mysqltest_embedded crashes when disconnecting before reap.
...
Before breaking the connection we have to check that there's no query
executing at the moment. Otherwise it can lead to crash in embedded server.
2008-03-19 15:51:22 +04:00
kaa@kaamos.(none)
e7d169fbde
Merge kaamos.(none):/data/src/opt/bug34512/my50
...
into kaamos.(none):/data/src/opt/bug34512/my51
2008-03-19 14:25:36 +03:00
kaa@kaamos.(none)
2b58fa027a
Merge kaamos.(none):/data/src/opt/bug34650/my51
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-19 12:18:16 +03:00
gshchepa/uchum@host.loc
cf90fb5571
Fixed bug #34763 .
...
Queries like:
SELECT ROW(1, 2) IN (SELECT t1.a, 2)
FROM t1 GROUP BY t1.a
or
SELECT ROW(1, 2) IN (SELECT t1.a, 2 FROM t2)
FROM t1 GROUP BY t1.a
lead to assertion failure in the
Item_in_subselect::row_value_transformer method in debugging
build, or to unexpected error message in release build:
ERROR 1247 (42S22): Reference '<list ref>' not supported (forward
reference in item list)
Unexpected error message and assertion failure have been
eliminated.
2008-03-14 23:11:59 +04:00
gluh@mysql.com/eagle.(none)
2f719d02c9
Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes
...
referenced_key_name field can be uninitialized in the case when
referenced table is dropped.
Added codition which allows to handle this situation.
2008-03-14 14:12:39 +04:00
kaa@kaamos.(none)
06bf29cf0f
Fixed test failures caused by insufficient cleanups in the tests for
...
bug12713.
2008-03-12 16:52:29 +03:00
kaa@kaamos.(none)
9c811ddec9
Post-merge fix.
2008-03-12 13:22:58 +03:00
kaa@kaamos.(none)
ae93d258aa
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-12 11:21:12 +03:00
kaa@kaamos.(none)
0a7052e4d3
Merge kaamos.(none):/data/src/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-12 11:19:46 +03:00
kaa@kaamos.(none)
d0eb90501d
Merge kaamos.(none):/data/src/mysql-5.0
...
into kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-03-12 10:59:15 +03:00
kaa@kaamos.(none)
7e365efa30
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-11 15:47:16 +03:00
holyfoot/hf@hfmain.(none)
e0851650e1
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/32801/my51-32801
2008-03-11 11:20:36 +04:00
tnurnberg@white.intern.koehntopp.de
f5b93ab932
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/34749/51-34749
2008-03-10 07:39:04 +01:00
tnurnberg@white.intern.koehntopp.de
3a87bbfe42
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/34749/50-34749
2008-03-10 07:11:12 +01:00
tnurnberg@white.intern.koehntopp.de
fd2bae9981
Merge mysql.com:/misc/mysql/34749/50-34749
...
into mysql.com:/misc/mysql/34749/51-34749
2008-03-10 07:07:56 +01:00
kaa@kaamos.(none)
04829e096d
Fix for bug #34650 : Test suite without cluster fails on Mac OS X
...
Leopard.
The change_user test failed because results of some statements
depended on platform and server build flags.
subselect_notembedded failure was a result of a bad merge from 5.0.
Fixed the corresponding test cases.
2008-03-07 21:14:34 +03:00
gkodinov/kgeorge@magare.gmz
dbc3ef6c9f
Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
2008-03-07 11:19:51 +02:00
gkodinov/kgeorge@magare.gmz
560ec24079
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt
2008-03-07 11:17:31 +02:00
gkodinov/kgeorge@magare.gmz
11cd97ed6b
Bug #34909 : mysqldump returns a 0 status on error when using
...
--master-data
No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.
2008-03-07 11:15:49 +02:00
kaa@kaamos.(none)
4ca61aa36e
Fix for bug #34512 : CAST( AVG( double ) AS DECIMAL )
...
returns wrong results
Casting AVG() to DECIMAL led to incorrect results when the arguments
had a non-DECIMAL type, because in this case
Item_sum_avg::val_decimal() performed the division by the number of
arguments twice.
Fixed by changing Item_sum_avg::val_decimal() to not rely on
Item_sum_sum::val_decimal(), i.e. calculate sum and divide using
DECIMAL arithmetics for DECIMAL arguments, and utilize val_real() with
subsequent conversion to DECIMAL otherwise.
2008-03-06 18:19:47 +03:00
sergefp@mysql.com
b779af5503
BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
...
- Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call
to before the late NULLs filtering code.
- Backport function comments from 6.0.
2008-03-03 20:35:44 +03:00
gluh@mysql.com/mgluh.(none)
b3397208eb
fixed test case problem on win
2008-03-03 20:29:58 +04:00
gluh@mysql.com/mgluh.(none)
1411d27977
test case fix
2008-03-03 15:38:18 +04:00
gluh@mysql.com/mgluh.(none)
fc1ae07785
test case fix
2008-03-03 15:02:34 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fbbd4391d9
Bug #32801 wait_timeout.test fails randomly
...
wait_timeout test enabled
2008-03-03 12:16:43 +04:00
gluh@mysql.com/eagle.(none)
2f5abfd3ef
fixed problem with embedded server
2008-02-29 17:58:35 +04:00
gluh@eagle.(none)
1616c68bde
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2008-02-29 16:58:20 +04:00
gluh@mysql.com/eagle.(none)
4d582db8ea
test fix
2008-02-29 16:56:41 +04:00
gluh@mysql.com/eagle.(none)
931bdedbc2
after merge fix
2008-02-29 15:04:00 +04:00
gluh@eagle.(none)
df5fbf5ae0
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2008-02-29 14:05:38 +04:00
gluh@mysql.com/eagle.(none)
13bb7e0a22
Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0)
...
added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of mysql data home directory in
DATA DIRECTORY & INDEX DIRECTORY is disallowed.
2008-02-29 13:55:00 +04:00
gluh@eagle.(none)
c59f1af6f5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2008-02-29 13:00:45 +04:00
gluh@mysql.com/eagle.(none)
8343c6922a
additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY
2008-02-29 12:52:50 +04:00
davi@buzz.(none)
2905909d89
Merge buzz.(none):/home/davi/mysql-5.0-runtime
...
into buzz.(none):/home/davi/mysql-5.1-runtime
2008-02-28 20:22:50 -03:00
gshchepa/uchum@host.loc
cf484bb18c
Merge host.loc:/home/uchum/work/PP/5.0-opt-34620
...
into host.loc:/home/uchum/work/5.1-opt
2008-02-28 23:01:22 +04:00
gshchepa/uchum@host.loc
11a27f1215
Merge host.loc:/home/uchum/work/PP/5.0-opt-34620
...
into host.loc:/home/uchum/work/5.0-opt
2008-02-28 22:57:22 +04:00