holyfoot/hf@hfmain.(none)
d76a3ef165
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/28005/my51-28005
2007-05-10 08:16:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d535add013
bug 27921 (Views ignore precision for CAST)
...
test result fixed
2007-05-10 08:14:53 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d99b4c6a1a
Bug #27921 View ignores precision for CAST()
...
Item_decimal_typecast::print properly implemented
2007-05-10 00:17:21 +05:00
ibabaev@bk-internal.mysql.com
71b2667abd
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-05-09 17:07:11 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
e3fa9c594d
Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
...
Missing check for overflow added to the Item_decimal_typecast::val_decimal
2007-05-09 17:27:14 +05:00
epotemkin@bk-internal.mysql.com
b0b4fecb99
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-05-09 12:55:05 +02:00
evgen@moonbone.local
b66298f455
loaddata.result, loaddata.test:
...
A test case is corrected.
2007-05-09 14:46:11 +04:00
msvensson@pilot.blaudden
0c1c191a1d
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-05-09 10:56:53 +02:00
msvensson@pilot.blaudden
d424941b4a
Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-09 10:55:09 +02:00
msvensson@pilot.blaudden
784ca670bd
Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193
...
into pilot.blaudden:/home/msvensson/mysql/bug28193/my51-bug28193
2007-05-09 10:53:07 +02:00
msvensson@pilot.blaudden
9242d395cd
Bug#28193 outfile fails randomly in pushbuild
...
- Change testcase to use remove_file
2007-05-09 10:52:28 +02:00
msvensson@pilot.blaudden
eeccd0de97
Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my41-bug28193
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-05-09 10:49:52 +02:00
msvensson@pilot.blaudden
6c0f90e921
Bug #28193 outfile fails randomly in pushbuild
...
- Change "exec rm" to "remove_file"
2007-05-09 10:49:11 +02:00
msvensson@pilot.blaudden
548240a73d
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-05-09 10:48:45 +02:00
igor@olga.mysql.com
e4af9fc790
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-05-08 17:50:19 -07:00
evgen@moonbone.local
b45ef06e76
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27670-bug-5.0-opt-mysql
2007-05-09 00:35:21 +04:00
evgen@moonbone.local
98fa542a08
Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
...
TIMESTAMP field when no value has been provided.
The LOAD DATA sets the current time in the TIMESTAMP field with
CURRENT_TIMESTAMP default value when the field is detected as a null.
But when the LOAD DATA command loads data from a file that doesn't contain
enough data for all fields then the rest of fields are simply set to null
without any check. This leads to no value being inserted to such TIMESTAMP
field.
Now the read_sep_field() and the read_fixed_length() functions set current
time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
when a NULL value is loaded to the field.
2007-05-09 00:23:16 +04:00
evgen@moonbone.local
fea4af6d49
item_cmpfunc.cc, type_datetime.result, type_datetime.test, item_cmpfunc.h:
...
After merge fix.
2007-05-08 22:28:24 +04:00
tomas@whalegate.ndb.mysql.com
9e8299240e
correcting previous commit
2007-05-08 19:07:36 +02:00
tomas@whalegate.ndb.mysql.com
1f6d0fd55f
increase heartbeat interval to avoid load related start up issues in mysql-test-run
2007-05-08 19:03:33 +02:00
tomas@whalegate.ndb.mysql.com
5463f4bd36
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-08 18:31:54 +02:00
tomas@whalegate.ndb.mysql.com
482e56f199
increate hearbeat interval to avoid load related start up issues in mysql-test-run
2007-05-08 18:30:03 +02:00
evgen@moonbone.local
df081a3a4f
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-05-08 15:54:49 +04:00
thek@adventure.(none)
4144dc7262
Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-05-08 12:18:36 +02:00
thek@adventure.(none)
770219c15a
Merge adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-08 12:02:38 +02:00
thek@adventure.(none)
902b02ec0b
Corrected test case for 5.1 requirements
2007-05-08 11:56:47 +02:00
thek@adventure.(none)
6927ddd85a
Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792
...
into adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792
2007-05-08 11:29:07 +02:00
thek@adventure.(none)
5e774747bc
4.1 -> 5.0 Manual merge for Bug #27792
2007-05-08 11:24:07 +02:00
jonas@perch.ndb.mysql.com
6415a8528a
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-05-08 08:24:21 +02:00
jonas@perch.ndb.mysql.com
72fec5b346
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-05-08 08:10:32 +02:00
jonas@perch.ndb.mysql.com
a6153ce335
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-05-08 08:09:19 +02:00
jonas@perch.ndb.mysql.com
27b1f61924
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-08 07:52:10 +02:00
jonas@perch.ndb.mysql.com
e47e6f7931
ndb - bug#27437
...
bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
this was however "normally" shadowed, but made LQH crash when LCP was about to start
2007-05-08 07:49:05 +02:00
gni@dev3-221.dev.cn.tlan
305d0eaf02
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2007-05-08 09:52:27 +08:00
igor@olga.mysql.com
efb13e1bfe
Adjusted results after the latest addition of test cases.
2007-05-07 16:58:38 -07:00
evgen@moonbone.local
afbfcd8480
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27759-bug-5.0-opt-mysql
2007-05-08 00:16:05 +04:00
evgen@moonbone.local
eddd02158b
Additional fix for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
2007-05-08 00:08:00 +04:00
gshchepa/uchum@gleb.loc
59efb58ffb
Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-27954
2007-05-08 00:53:01 +05:00
acurtis/antony@ltamd64.xiphis.org
b8301263f3
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-merge
2007-05-07 12:32:09 -07:00
gshchepa/uchum@gleb.loc
eb1f21f8b6
Fixed bug #27954 .
...
This bug affects multi-row INSERT ... ON DUPLICATE into table
with PRIMARY KEY of AUTO_INCREMENT field and some additional UNIQUE indices.
If the first row in multi-row INSERT contains duplicated values of UNIQUE
indices, then following rows of multi-row INSERT (with either duplicated or
unique key field values) may me applied to _arbitrary_ records of table as
updates.
This bug was introduced in 5.0. Related code was widely rewritten in 5.1, and
5.1 is already free of this problem. 4.1 was not affected too.
When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
restore_auto_increment(), which set next_insert_id back to 0, but we
forgot to set clear_next_insert_id back to 0.
restore_auto_increment() function has been fixed.
2007-05-08 00:24:25 +05:00
evgen@moonbone.local
6ec0bc24a7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/28133-bug-5.0-opt-mysql
2007-05-07 22:22:51 +04:00
evgen@moonbone.local
7d473a1a37
Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
...
The IN function was comparing DATE/DATETIME values either as ints or as
strings. Both methods have their disadvantages and may lead to a wrong
result.
Now IN function checks whether all of its arguments has the STRING result
types and at least one of them is a DATE/DATETIME item. If so it uses either
an object of the in_datetime class or an object of the cmp_item_datetime
class to perform its work. If the IN() function arguments are rows then
row columns are checked whether the DATE/DATETIME comparator should be used
to compare them.
The in_datetime class is used to find occurence of the item to be checked
in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
class is used to compare items one by one in the DATE/DATETIME context.
Both classes obtain values from items with help of the get_datetime_value()
function and cache the left item if it is a constant one.
2007-05-07 22:20:43 +04:00
cmiller@zippy.cornsilk.net
2fbe9eba13
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976
2007-05-07 12:39:20 -04:00
cmiller@zippy.cornsilk.net
550ed5f312
Fix new error message list in v5.
2007-05-07 12:38:43 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
f646fb0b11
merging fix
2007-05-07 17:33:28 +05:00
holyfoot/hf@hfmain.(none)
763d4bf22e
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-07 16:12:42 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
37a9575b2e
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-05-07 16:08:29 +05:00
holyfoot/hf@hfmain.(none)
41c2ee8723
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-05-07 15:59:25 +05:00
tomas@whalegate.ndb.mysql.com
35a0af3113
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-07 11:12:52 +02:00
thek@adventure.(none)
889a56e07c
Merge adventure.(none):/home/thek/Development/cpp/bug26977/my50-bug26977
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-05-07 10:32:00 +02:00