df@pippilotta.erinye.com
9e27458ca2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-17707
2007-05-29 12:38:04 +02:00
df@pippilotta.erinye.com
82669a375c
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work-17707
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707
2007-05-29 12:25:51 +02:00
df@pippilotta.erinye.com
1db91f163b
BUG#17707 check-cpu script doesn't include Turion
2007-05-29 12:23:49 +02:00
df@pippilotta.erinye.com
918d90d516
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-24 09:12:29 +02:00
df@pippilotta.erinye.com
77e1e678d3
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-23 10:51:27 +02:00
df@pippilotta.erinye.com
a70903b7f8
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-23 10:49:26 +02:00
df@pippilotta.erinye.com
f8433465a2
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-23 08:40:39 +02:00
joerg@trift2.
b8e3fb1333
Merge trift2.:/MySQL/M50/bug26609-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-05-22 20:02:23 +02:00
joerg@trift2.
49dc9c5971
Merge trift2.:/MySQL/M50/bug26609-5.0
...
into trift2.:/MySQL/M51/bug26609-5.1
2007-05-22 17:51:51 +02:00
joerg@trift2.
1185004419
Add the "row_lock" test suite to the (to be) release build test run.
2007-05-22 17:21:22 +02:00
joerg@trift2.
b0677f1ddc
scripts/make_binary_distribution.sh :
...
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
2007-05-22 17:06:47 +02:00
joerg@trift2.
8a0f37d559
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-05-21 20:34:42 +02:00
joerg@trift2.
bbae855c72
Prevent the failing "jp" suite from causing havoc in release builds (28563).
2007-05-21 20:24:34 +02:00
holyfoot/hf@hfmain.(none)
a61c5f7722
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-20 21:10:44 +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
joerg@trift2.
4c11cf2dce
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-05-18 12:01:54 +02: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
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