tomas@whalegate.ndb.mysql.com
4605e9e5a9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-30 17:32:20 +02:00
tomas@whalegate.ndb.mysql.com
fa3c9a0694
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-05-30 17:30:18 +02:00
tomas@whalegate.ndb.mysql.com
44fc6a9288
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-30 12:36:33 +02:00
tomas@whalegate.ndb.mysql.com
a0cfb015a7
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-05-30 12:35:00 +02:00
tomas@whalegate.ndb.mysql.com
882535f4c2
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-30 09:02:51 +02:00
tomas@whalegate.ndb.mysql.com
2c3c36dfe6
shorten some files for tar to work
2007-05-29 23:39:57 +02:00
tomas@whalegate.ndb.mysql.com
f43bbc123d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-05-29 09:39:57 +02:00
tomas@whalegate.ndb.mysql.com
c9e5509fcb
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-29 09:29:51 +02:00
jonas@perch.ndb.mysql.com
151e4f4534
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-29 07:23:39 +02:00
jonas@perch.ndb.mysql.com
226ef1ed22
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-29 07:20:32 +02:00
jonas@perch.ndb.mysql.com
dc65597952
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-29 07:18:44 +02:00
tomas@whalegate.ndb.mysql.com
75ec66e13e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-28 16:35:37 +02:00
tomas@whalegate.ndb.mysql.com
eb1ab68600
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-05-28 16:32:50 +02:00
tomas@whalegate.ndb.mysql.com
8ea3aeb11b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-28 16:14:52 +02:00
tomas@whalegate.ndb.mysql.com
06a2aab79e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-05-28 16:06:34 +02:00
mskold/marty@linux.site
9ad3721e95
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-05-28 15:00:18 +02:00
tomas@whalegate.ndb.mysql.com
248c4ac946
Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
...
- correction, backport to 5.0
2007-05-28 13:05:05 +02:00
tomas@whalegate.ndb.mysql.com
8c3eb6c272
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-28 13:00:09 +02:00
mats@kindahl-laptop.dnsalias.net
9a92325c02
WL#3303 (RBR: Engine-controlled logging format):
...
Adding support to allow engines to tell what formats they can handle.
The server will generate an error if it is not possible to log the
statement according to the logging mode in effect.
Adding flags to several storage engines to state what they can handle.
Changes to NDB handler removing code that forces row-based mode and
adding flag saying that NDB can only handle row format.
Adding check that binlog flags are only used for real tables that are
opened for writing.
2007-05-28 12:50:29 +02:00
tomas@whalegate.ndb.mysql.com
d5303f4aef
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-28 12:22:21 +02:00
tomas@whalegate.ndb.mysql.com
3850902ad1
Bug #28525 Node failures in PGMAN at ndbrequire (line 430)
...
(part 2)
2007-05-28 12:20:34 +02:00
svoj@mysql.com/june.mysql.com
5d71c2f885
BUG#18839 - return value of parser->parse() is ignored
...
Check value returned by parser->parse(). Better handle situations
when it fails.
2007-05-28 13:27:26 +05:00
lars/lthalmann@dl145h.mysql.com
95068ddacb
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-05-28 09:25:40 +02:00
tomas@whalegate.ndb.mysql.com
98b4d7a810
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-25 12:26:11 +02:00
tomas@whalegate.ndb.mysql.com
d259028183
Bug #28525 Node failures in PGMAN at ndbrequire (line 430)
2007-05-25 12:25:15 +02:00
tomas@whalegate.ndb.mysql.com
28769b0f25
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-24 21:02:44 +02:00
jani@linux-th5m.site
ee4d6b4fc0
Merged from main 5.1
2007-05-24 19:47:58 +03:00
tomas@whalegate.ndb.mysql.com
1b7e33d8f4
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-05-24 17:01:16 +02:00
tomas@whalegate.ndb.mysql.com
fe8db78b9a
Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
...
- correction, use recomputed _actual_ redobuffer
2007-05-24 16:50:38 +02:00
tomas@whalegate.ndb.mysql.com
39aa3e99ea
Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
...
- parameterize on RedoBuffer
2007-05-24 16:40:05 +02:00
jani@linux-th5m.site
f1807e1f25
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into linux-th5m.site:/home/my/mysql-5.1-marvel
2007-05-24 15:26:10 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
fc3b3a0a86
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-05-24 13:24:36 +03:00
lars/lthalmann@dl145h.mysql.com
8b1deb28bf
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-24 09:07:35 +02:00
svoj@june.mysql.com
442969fd16
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-05-23 12:41:30 +05:00
tomas@whalegate.ndb.mysql.com
a4934466c0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:21:32 +02:00
tomas@whalegate.ndb.mysql.com
2c715f1ad4
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 17:57:48 +02:00
tomas@whalegate.ndb.mysql.com
b46c826aee
Bug #28593 cluster backup scans in acc index order, bad for disk data
...
- change to scan in tup and disk order (if applicable)
2007-05-22 17:53:07 +02:00
tsmith@quadxeon.mysql.com
672237f5b5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-21 20:51:31 +02:00
tomas@whalegate.ndb.mysql.com
ffe2982b99
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-21 09:01:06 +02:00
tomas@whalegate.ndb.mysql.com
a2b2bbd925
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-21 08:48:33 +02:00
jonas@perch.ndb.mysql.com
be3342cf7c
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-18 11:37:30 +02:00
jonas@perch.ndb.mysql.com
2c60a173ab
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-18 11:36:24 +02:00
jonas@perch.ndb.mysql.com
f975b3e398
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-18 11:16:47 +02:00
jonas@perch.ndb.mysql.com
2457643b40
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-18 11:10:04 +02:00
jonas@perch.ndb.mysql.com
fbc43bf607
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-18 10:10:20 +02:00
jonas@perch.ndb.mysql.com
1cf5735058
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-05-18 10:00:10 +02:00
tsmith@siva.hindu.god
33181d075c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-05-17 14:24:02 -06:00
tsmith@siva.hindu.god
4a4590cd49
Merge siva.hindu.god:/home/tsmith/m/bk/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-05-17 14:21:35 -06:00
dkatz@damien-katzs-computer.local
da10c5dd0b
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-05-17 16:18:35 -04:00
jonas@perch.ndb.mysql.com
0161ba4893
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-17 08:57:03 +02:00