tomas@whalegate.ndb.mysql.com
681ef616ed
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2007-05-10 09:04:05 +02:00
holyfoot/hf@hfmain.(none)
39597b791b
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/28005/my51-28005
2007-05-10 11:30:50 +05:00
tomas@whalegate.ndb.mysql.com
19a2814f47
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-10 08:06:09 +02:00
tomas@whalegate.ndb.mysql.com
fd5f5d0abd
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-10 07:15:46 +02:00
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
tomas@whalegate.ndb.mysql.com
a84d2971fc
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-09 15:04:45 +02:00
tomas@whalegate.ndb.mysql.com
ef1fdd3017
enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
...
+ do this for management server
2007-05-09 15:03:01 +02:00
tomas@whalegate.ndb.mysql.com
9b1157537b
Bug #28287 Sign problem in test "ndb_restore_print"
...
- corrected previous patch
- some platforms do strange things with char... use Int8 to be sure of signedness
2007-05-09 14:31:22 +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
tomas@whalegate.ndb.mysql.com
73306167ca
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-09 12:52:23 +02:00
tomas@whalegate.ndb.mysql.com
caeb6ae034
Bug #27292 restarting a data node makes sql nodes log event buffer status every few seconds
2007-05-09 12:51:37 +02:00
evgen@moonbone.local
b66298f455
loaddata.result, loaddata.test:
...
A test case is corrected.
2007-05-09 14:46:11 +04:00
tomas@whalegate.ndb.mysql.com
aaeca5bda8
Bug #28287 Sign problem in test "ndb_restore_print"
...
- some platforms do strange things with char... use Int8 to be sure of signedness
2007-05-09 10:22:26 +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
tomas@whalegate.ndb.mysql.com
fce52b2050
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-08 18:19:38 +02:00
jonas@perch.ndb.mysql.com
0f29fa28af
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 15:10:18 +02:00
jonas@perch.ndb.mysql.com
de3070265d
ndb - bug#20535
...
set null bits on delete+insert
2007-05-08 14:59:57 +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
jonas@perch.ndb.mysql.com
6b2819c47b
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 12:57:37 +02:00
jonas@perch.ndb.mysql.com
5833fecd6a
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 12:57:19 +02:00
jonas@perch.ndb.mysql.com
73f24392e2
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-08 12:54:27 +02:00
jonas@perch.ndb.mysql.com
dbf58f9781
ndb - bug#27437
...
redo extra verification code so that tupkeyref is reset just before tupkeyreq
2007-05-08 12:53:12 +02: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
jbruehe/mysqldev@mysql.com/production.mysql.com
7357712fda
Raise version number after cloning 5.1.18-beta
2007-05-08 11:16:41 +02:00
thek@adventure.(none)
4744b0b91e
Merge adventure.(none):/home/thek/Development/cpp/bug27792/my41-bug27792
...
into adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792
2007-05-08 09:36:21 +02:00
thek@adventure.(none)
4ea05eae31
Bug #27792 query cache returns wrong result, with certain system variables
...
- Queries in the query cache are identified by the individual
characters in the query statement, the current database and
the current environment expressed as a set of system variable
flags.
- Since the set of environment flags didn't properly describe the
current environment unexpected results were returned from the
query cache.
- Query cache is now cleared when the variable ft_boolean_syntax is
updated.
- An identification flag for the variable default_week_format is
added to the query cache record.
Thanks to Martin Friebe who has supplied significant parts of this patch.
2007-05-08 09:09:25 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
e86643ec0f
warning eliminated
2007-05-08 11:42:40 +05: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/root@dev3-221.dev.cn.tlan
87b5c46df4
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb
2007-05-08 10:02:55 +08:00
gni@dev3-221.dev.cn.tlan
db73bea313
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
2007-05-08 10:00:12 +08: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