Commit graph

46452 commits

Author SHA1 Message Date
holyfoot/hf@hfmain.(none)
27f19c5b15 Merge mysql.com:/home/hf/work/28361/my50-28361
into  mysql.com:/home/hf/work/28361/my51-28361
2007-05-21 17:54:33 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
7bb143aa04 test result fixed 2007-05-21 17:53:55 +05:00
holyfoot/hf@hfmain.(none)
91bc2c2cfc Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/27894/my51-27894
2007-05-21 14:51:57 +05:00
holyfoot/hf@hfmain.(none)
f0cb542d21 Merge mysql.com:/home/hf/work/27894/my50-27894
into  mysql.com:/home/hf/work/27894/my51-27894
2007-05-21 13:02:54 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
b96e1df90c Bug #28361 Buffer overflow in DECIMAL code on Windows
result max length changed for the 'decimal' fields
so test results have to be fixed
2007-05-21 13:02:03 +05:00
gkodinov/kgeorge@magare.gmz
eec6b028e3 Merge magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B22855-5.1-opt
2007-05-21 10:22:44 +03:00
gkodinov/kgeorge@magare.gmz
6c8e7952a1 Merge macbook:mysql/work/B22855-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-opt
2007-05-21 10:21:55 +03:00
holyfoot/hf@hfmain.(none)
b376b9b4a5 Merge mysql.com:/home/hf/work/28361/my50-28361
into  mysql.com:/home/hf/work/28361/my51-28361
2007-05-20 21:56:56 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
1b8ba5e424 bug #28361 Buffer overflow in DECIMAL code on Windows
my_decimal in some cases can contain more decimal digits than
is officially supported (DECIMAL_MAX_PRECISION), so we need to
prepare bigger buffer for the resulting string.
2007-05-20 21:22:57 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
e04000ec21 merging 2007-05-18 23:21:34 +05:00
holyfoot/hf@hfmain.(none)
44331376e7 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 22:12:06 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d5685d4cc4 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 22:09:15 +05:00
serg@sergbook.mysql.com
c7a4547361 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2007-05-18 18:22:38 +02:00
serg@sergbook.mysql.com
11e5fa8f71 added cleanup to some tests 2007-05-18 17:48:44 +02:00
holyfoot/hf@hfmain.(none)
e2abd12b79 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 20:04:39 +05:00
holyfoot/hf@hfmain.(none)
783c7071bf Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 20:04:01 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
093b0deb06 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b21517de4 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-18 20:02:27 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
38c8951d11 Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-05-18 20:01:49 +05:00
holyfoot/hf@hfmain.(none)
85d5dfedf6 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-18 20:00:49 +05:00
evgen@moonbone.local
835189cb85 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
2007-05-18 13:39:34 +04:00
igor@olga.mysql.com
2189c571b2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28337
2007-05-17 16:06:57 -07:00
evgen@moonbone.local
0e3c4f6729 Bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
is involved.

The Arg_comparator::compare_datetime() comparator caches its arguments if
they are constants i.e. const_item() returns true. The
Item_func_get_user_var::const_item() returns true or false based on
the current query_id and the query_id where the variable was created.
Thus even if a query can change its value its const_item() still will return
true. All this leads to a wrong comparison result when an object of the
Item_func_get_user_var class is involved.

Now the Arg_comparator::can_compare_as_dates() and the
get_datetime_value() functions never cache result of the GET_USER_VAR()
function (the Item_func_get_user_var class).
2007-05-17 23:09:45 +04:00
gkodinov/kgeorge@macbook.gmz
a9b348c71c Bug#22855:
Conversion errors when constructing the condition for an
IN predicates were treated as if the affected column contains
NULL. If such a IN predicate is inside NOT we get wrong 
results.
Corrected the handling of conversion errors in an IN predicate 
that is resolved by unique_subquery (through 
subselect_uniquesubquery_engine).
2007-05-17 19:38:34 +03:00
gluh@eagle.(none)
d12e6f7b0b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-05-17 13:28:29 +05:00
gluh@mysql.com/eagle.(none)
38d1e6dbc7 valgrind error fix(addon) 2007-05-17 13:27:39 +05:00
igor@olga.mysql.com
8c34ae268c Fixed bug #28337: wrong results for grouping queries with correlated
subqueries in WHERE conditions.
This bug was introduced by the patch for bug 27321.
2007-05-16 23:42:10 -07:00
joerg@trift2.
c90682326e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2007-05-16 21:24:54 +02:00
joerg@trift2.
a231b0574b Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-05-16 21:23:15 +02:00
joerg@trift2.
2d3686970c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-05-16 21:21:16 +02:00
joerg@trift2.
bdc7bcd107 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-05-16 21:18:50 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
4ac1e98630 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/8663/my50-8663
2007-05-17 00:10:39 +05:00
holyfoot/hf@hfmain.(none)
c4d3178eca Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/8663/my51-8663
2007-05-17 00:10:16 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
28eddbe12b Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/8663/my50-8663
2007-05-17 00:09:43 +05:00
joerg@trift2.
d84c807204 After-merge fix in "scripts/make_win_bin_dist":
Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.
2007-05-16 21:00:35 +02:00
joerg@trift2.
b3f35b8be5 Manual merge. 2007-05-16 20:52:50 +02:00
joerg@trift2.
453af10529 Ensure that the 5.1 version of "scripts/make_win_bin_dist" depends on 5.0,
so that changes from 5.0 propagate (on merge) into the 5.1 version.
2007-05-16 20:29:49 +02:00
holyfoot/hf@hfmain.(none)
cd4fbe116e Merge mysql.com:/home/hf/work/8663/my50-8663
into  mysql.com:/home/hf/work/8663/my51-8663
2007-05-16 23:01:21 +05:00
df@pippilotta.erinye.com
6bf66552bd 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-05-16 17:28:09 +02:00
df@pippilotta.erinye.com
5e541e98a2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-16 17:27:30 +02:00
df@pippilotta.erinye.com
000c92a3bc Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-16 17:27:19 +02:00
df@pippilotta.erinye.com
fbd59055ec Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-05-16 17:26:55 +02:00
df@pippilotta.erinye.com
3bff0c581c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-16 17:26:18 +02:00
df@pippilotta.erinye.com
35ca5b1ef1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-16 17:26:02 +02:00
df@pippilotta.erinye.com
558e6d9aa5 Merge bk-internal:/home/bk/mysql-5.1-runtime
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-16 17:13:46 +02:00
df@pippilotta.erinye.com
4e0af1afdc Merge bk-internal:/home/bk/mysql-5.0-runtime
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-16 17:13:42 +02:00
df@pippilotta.erinye.com
dabeacaca6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-16 17:08:28 +02:00
df@pippilotta.erinye.com
a645ef0480 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-16 17:07:34 +02:00
gluh@mysql.com/eagle.(none)
72b7b7de24 valgrind error fix 2007-05-16 19:19:23 +05:00
df@pippilotta.erinye.com
2ea846c533 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-05-16 16:04:42 +02:00