sergefp@mysql.com
49e23937e4
Merge mysql.com:/home/psergey/tmp_merge
...
into mysql.com:/home/psergey/mysql-5.1-merge
2006-05-19 16:00:29 +04:00
lars@mysql.com
399a1b845b
After merge fixes
2006-05-18 21:40:52 +02:00
lars@mysql.com
87bb4f95ea
Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-05-18 18:38:50 +02:00
knielsen@mysql.com
8d1499a6ad
Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.1
...
into mysql.com:/data0/knielsen/tmp-5.1
2006-05-18 14:20:13 +02:00
knielsen@mysql.com
339afc620f
After-merge fix.
2006-05-18 13:35:15 +02:00
knielsen@mysql.com
a061c90d8a
Merge mysql.com:/usr/local/mysql/tmp_merge
...
into mysql.com:/usr/local/mysql/merge-5.1
2006-05-18 11:56:50 +02:00
joerg@mysql.com
7acde58f60
Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M51/merge-5.1
2006-05-18 11:20:03 +02:00
igor@rurik.mysql.com
0d069edaa2
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 17:20:03 -07:00
kent@mysql.com
4ab4c99eff
type_newdecimal.result, case.result:
...
Adjusted merge
2006-05-18 00:42:07 +02:00
kent@mysql.com
5842dcaa7d
Merge mysql.com:/data0/mysqldev/my/tmp_merge
...
into mysql.com:/tmp/mysql-5.1-new
2006-05-17 23:35:08 +02:00
igor@rurik.mysql.com
62f61f527f
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 11:46:21 -07:00
joerg@mysql.com
93d1c2b307
Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp".
...
Fixes bug#19040 "yaSSL does not compile on AIX".
2006-05-17 19:08:18 +02:00
joerg@mysql.com
5d6fe2770c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/merge-5.1
2006-05-17 18:14:38 +02:00
knielsen@mysql.com
bf153b66a3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-17 15:09:40 +02:00
joerg@mysql.com
f253fd3096
Merge mysql.com:/M50/tmp_merge into mysql.com:/M51/merge-5.1
2006-05-17 15:07:44 +02:00
knielsen@mysql.com
f82c39ce4b
After-merge fixes.
2006-05-17 15:01:48 +02:00
gkodinov@mysql.com
9f9a76eb6e
Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge
...
into mysql.com:/home/kgeorge/mysql/5.1/merge
2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
6fffa7b73a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-17 10:15:35 +02:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
2006-05-17 08:34:48 +02:00
cmiller@zippy.(none)
593daae150
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-16 18:42:59 -04:00
tomas@poseidon.ndb.mysql.com
37df8f14d8
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-17 00:27:19 +02:00
tomas@poseidon.ndb.mysql.com
23be1988fc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-17 00:23:40 +02:00
tomas@poseidon.ndb.mysql.com
9432143bee
ndb: added some missing error codes to mgmapi
...
ndb: ndb_waiter disconnect/reconnect on get status error
2006-05-17 00:22:43 +02:00
tomas@poseidon.ndb.mysql.com
86c898febe
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 20:58:19 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- adoptions to handle binlog
2006-05-16 20:56:45 +02:00
jmiller@mysql.com
44d1f74f99
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-16 15:39:41 +02:00
jmiller@mysql.com
d022cacbc1
Updated to fix bug in AIX
2006-05-16 15:38:21 +02:00
jmiller@mysql.com
46ad615f6e
rpl_log.test:
...
Fix for failure in aix52 failure during push build
2006-05-16 14:59:44 +02:00
knielsen@mysql.com
a729d7fcdd
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-16 14:34:35 +02:00
sergefp@mysql.com
c89fc77116
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 15:34:23 +04:00
andrey@lmy004.
743a57fda1
disable events_logs_tests
2006-05-16 12:05:15 +02:00
tulin@production.mysql.com
d4c739fda3
information_schema.result:
...
corrected merge
2006-05-16 12:00:17 +02:00
tomas@poseidon.ndb.mysql.com
a9f00644c6
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 12:00:16 +02:00
tomas@poseidon.ndb.mysql.com
ea3067a50d
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-16 11:50:13 +02:00
tomas@poseidon.ndb.mysql.com
3559bdb7b6
Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
...
- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
2006-05-16 11:47:33 +02:00
sergefp@mysql.com
b7c52881d1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 13:46:30 +04:00
sergefp@mysql.com
27651394a7
BUG#19618: post-review fixes: better comments
2006-05-16 13:39:03 +04:00
tomas@poseidon.ndb.mysql.com
1fe8fe7895
corrected merge
2006-05-16 11:32:43 +02:00
tomas@poseidon.ndb.mysql.com
b592d872ec
Merge jonas@perch:src/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-05-16 11:31:10 +02:00
tomas@poseidon.ndb.mysql.com
9e883ac3d7
Merge jonas@perch:src/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-16 11:05:50 +02:00
tomas@poseidon.ndb.mysql.com
6cb699d208
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:37:40 +02:00
knielsen@mysql.com
62e0e90a51
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-16 10:34:12 +02:00
tomas@poseidon.ndb.mysql.com
08438b6054
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:21:37 +02:00
lars@mysql.com
a29504cbcb
Test used a charset not available on many platforms
2006-05-16 10:01:07 +02:00
lars@mysql.com
3b8a10dbd7
Fixed result file (rpl_temporary)
2006-05-16 09:26:57 +02:00
tnurnberg@mysql.com
0613889746
Merge mysql.com:/home/tmp_merge
...
into mysql.com:/home/mysql-5.1-18997e
2006-05-16 03:33:43 +02:00
tnurnberg@mysql.com
d1311e1ac7
Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
...
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
2006-05-16 03:32:24 +02:00
kent@mysql.com
a31d16abe8
Merge mysql.com:/data0/mysqldev/my/tmp_merge
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-16 01:59:09 +02:00
cmiller@zippy.(none)
d8330e2858
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-15 19:26:49 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
faedacaf87
Removed double enum value.
2006-05-16 01:12:12 +03:00