istruewing@chilla.local
938fc3d66e
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-16 13:14:23 +02:00
iggy@alf.
e0adab8ce7
Merge alf.:D:/src/mysql-5.1-maint
...
into alf.:D:/src/mysql-5.1-maint_winemb
2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0
Embedded Server doesn't build on Windows.
...
- Add build configuration parameter EMBEDDED_ONLY which will configure
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
2007-06-15 14:32:16 -04:00
bar@bar.myoffice.izhnet.ru
615297df8b
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
2007-06-15 11:27:10 +05:00
antony@ppcg5.local
21c233440d
Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6
...
into ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
2007-06-14 16:04:52 -07:00
svoj@june.mysql.com
09cd5b5ef8
Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-14 16:19:47 +05:00
svoj@mysql.com/june.mysql.com
a1529d92d1
BUG#26976 - Missing table in merge not noted in related error msg +
...
SHOW CREATE TABLE fails
After merge fixes.
2007-06-08 11:20:50 +05:00
svoj@june.mysql.com
d0a044a0bf
Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-07 13:53:23 +05:00
tomas@whalegate.ndb.mysql.com
016cf69867
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-06 16:51:04 +02:00
istruewing@chilla.local
a28abc0554
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-05 21:40:46 +02:00
tomas@poseidon.mysql.com
8fd5212a9f
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-05 18:00:42 +02:00
tomas@poseidon.mysql.com
ce93bc3d13
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-06-05 17:51:53 +02:00
tomas@poseidon.mysql.com
47d5fb91d2
Bug #28751 Lots of memory locked in memory causes high kswapd
...
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
2007-06-05 17:29:50 +02:00
tomas@poseidon.mysql.com
8c35f44b21
Bug #28899 not possible to set separate watchdog timeout at startup
2007-06-05 17:06:33 +02:00
tomas@whalegate.ndb.mysql.com
c5e13ae053
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-04 22:23:14 +02:00
jonas@perch.ndb.mysql.com
50d2a6de0c
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-06-04 11:59:14 +02:00
jonas@perch.ndb.mysql.com
130667233a
ndb - bug#28726
...
make sure to remove LCP files aswell if specifying --initial
2007-06-04 11:58:25 +02:00
joerg@trift2.
d822cf03e5
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-06-04 11:24:49 +02:00
jonas@perch.ndb.mysql.com
79da61069b
ndb -
...
update dl145a config for autotest
2007-06-04 10:32:32 +02:00
jonas@perch.ndb.mysql.com
eab3e836e8
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-06-04 10:29:57 +02:00
jonas@perch.ndb.mysql.com
b8e43a1d9d
ndb - make size of redo log files (fragment log files) configurable
...
using new config variable FragmentLogFileSize (4M - 1G)
2007-06-04 10:27:10 +02:00
tomas@whalegate.ndb.mysql.com
4ef92c285b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-03 19:41:14 +02:00
tomas@whalegate.ndb.mysql.com
7523452de1
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-06-03 19:31:53 +02:00
tomas@whalegate.ndb.mysql.com
8a9bf13922
Bug#20612.
2007-06-03 19:30:37 +02:00
tomas@whalegate.ndb.mysql.com
eb5fd16e59
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-02 06:33:18 +02:00
kostja@bodhi.(none)
16633169e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 12:12:06 +04:00
istruewing@chilla.local
4ba6a0fb7e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-05-31 21:28:04 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791
Added casts to avoid compiler warnings and fixed a wrong type.
...
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
2007-05-31 17:45:22 +03:00
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
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
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