dkatz@damien-katzs-computer.local
c21c22d85f
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_div_zero
2007-05-17 16:07:44 -04: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
tsmith@siva.hindu.god
8406164e7e
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-05-17 12:57:35 -06:00
tsmith@siva.hindu.god
2703da69ff
ps_6bdb.result:
...
Fix bad merge of test results
2007-05-17 12:55:59 -06: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
dkatz@damien-katzs-computer.local
41dac22271
Bug #27119 server crash with integer division by zero during filesort on huge result
...
Added checks to detect integer overflow and fixed other bugs on the error path.
2007-05-16 16:14:13 -04: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
msvensson@pilot.blaudden
4998976d22
Bug#28473 Does mysql-test-run.pl handle LD_LIBRARY_PATH wrong ?
...
- Fix spelling error
2007-05-16 17:51:28 +02: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
msvensson@pilot.blaudden
d5676f2feb
WL#2247 mysqltest: add option for sorting results
...
- Change from "query_sorted <query>" to "sorted_results"
2007-05-16 17:19:36 +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
msvensson@pilot.blaudden
7147db553d
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-16 16:31:30 +02:00
msvensson@pilot.blaudden
4fed3bd425
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-16 16:31:05 +02:00
msvensson@pilot.blaudden
8e9149ea11
Bug#28470 mysqltest scripts need to know protocol
2007-05-16 16:30:26 +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
df@pippilotta.erinye.com
ebab70bcb0
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-05-16 16:03:30 +02:00
kostja@vajra.(none)
e4a3189c4f
Comment fix.
2007-05-16 17:19:59 +04:00
thek@adventure.(none)
6d6674e71f
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-05-16 14:54:47 +02:00
thek@adventure.(none)
06ce477223
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-16 14:51:01 +02:00
thek@adventure.(none)
0e82ce84c9
Merge adventure.(none):/home/thek/Development/cpp/bug27415/my50-bug27415
...
into adventure.(none):/home/thek/Development/cpp/bug27415/my51-bug27415
2007-05-16 14:48:31 +02:00
thek@adventure.(none)
ed43ceb178
Bug#27415 Text Variables in stored procedures
...
- Problem was reported as a SP variable using itself as
right value inside SUBSTR caused corruption of data.
- This bug could not be verified in either 5.0bk or 5.1bk
- Added test case to prevent future regressions.
2007-05-16 14:25:38 +02:00
kostja@vajra.(none)
672f2bd548
Fix a typo.
2007-05-16 16:05:19 +04:00
msvensson@pilot.blaudden
c38b188f7d
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-16 14:01:14 +02:00
kostja@vajra.(none)
35ad681618
An attempt to fix event_bugs.test failure on Debian
...
(Bug#26338 "events_bugs.test fail on Debian")
2007-05-16 16:01:14 +04:00
msvensson@pilot.blaudden
290b975043
Bug#21103: "DATE column not compared as DATE"
...
BDB results fixed (not p/o 5.1 fix)
2007-05-16 14:00:47 +02:00
msvensson@pilot.blaudden
afdd1a986f
Update to 5.1 format
2007-05-16 13:48:20 +02:00
kostja@vajra.(none)
37843864da
Make a stab at events_bugs.test failure under valgrind (no
...
open bug report, reproduced in the runtime team tree).
2007-05-16 15:35:18 +04:00
msvensson@pilot.blaudden
623d936038
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-16 12:50:24 +02:00
msvensson@pilot.blaudden
3d723860c7
Merge pilot.blaudden:/home/msvensson/mysql/bk_fix/mysql-5.0-maint-patch4
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-16 12:49:15 +02:00