Commit graph

2406 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
2a002fc1ef Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 09:20:23 +02:00
jonas@perch.ndb.mysql.com
1f84a13977 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 09:10:11 +02:00
jonas@perch.ndb.mysql.com
ac29fd0051 bug#13316
ndb alter table with big dicttabinfo
  send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE
2005-09-22 08:35:27 +02:00
stewart@mysql.com
0d716ef8fa GCC4 build fix 2005-09-22 15:48:40 +10:00
jonas@perch.ndb.mysql.com
d25f763c2d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 07:14:22 +02:00
jonas@perch.ndb.mysql.com
e02eb8d6e7 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 07:12:39 +02:00
jonas@perch.ndb.mysql.com
4009307f0b ndb - fix gcc4 compile problem 2005-09-22 07:11:53 +02:00
jonas@perch.ndb.mysql.com
232ac1db8d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-21 17:38:07 +02:00
jonas@perch.ndb.mysql.com
8f11620d9a ndb merge fix 2005-09-21 17:37:33 +02:00
jonas@perch.ndb.mysql.com
9a33319d6c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-21 17:27:04 +02:00
jonas@perch.ndb.mysql.com
ed8f33f057 bug#12950
ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data
2005-09-21 17:24:39 +02:00
jonas@perch.ndb.mysql.com
b49ec75b42 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-20 12:52:42 +02:00
jonas@perch.ndb.mysql.com
75cc4ef28a ndb - post merge fixes 2005-09-20 12:07:18 +02:00
jonas@perch.ndb.mysql.com
2119a88abe Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-20 10:46:33 +02:00
mskold@mysql.com
f852307d8e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-09-20 10:35:47 +02:00
mskold@mysql.com
cb4745591f Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption 2005-09-20 10:34:00 +02:00
kent@mysql.com
654277084c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-19 15:31:09 +02:00
jonas@perch.ndb.mysql.com
5c836e2ab7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-19 15:00:13 +02:00
jonas@perch.ndb.mysql.com
e358a81710 bug#9282 - ndb
big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId
2005-09-19 14:05:54 +02:00
jonas@perch.ndb.mysql.com
c3d07de037 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-17 10:05:07 +02:00
jonas@perch.ndb.mysql.com
81013a01b1 ndb
remove extra ";" from test programs
2005-09-16 14:18:27 +02:00
jonas@eel.(none)
e899d41169 ndb
impl support for querying resource usage in ndb api
  to help track down mem leaks
2005-09-16 11:26:34 +02:00
pekka@mysql.com
af1ddc205b ndb - bug#9994 backpatch fixes from 5.0
IGNORE on merge 4.1->5.0
2005-09-15 14:48:49 +02:00
stewart@mysql.com
9e5e9603b5 BUG#13136 NdbTCP.cpp compile failure on OSX 10.2
use select if poll is unavailable.
2005-09-15 00:21:25 +10:00
ndbdev@dl145c.mysql.com
a80d0e5d39 merge 2005-09-13 13:18:14 +02:00
tulin@dl145c.mysql.com
5f122007fa minor compile error fix 2005-09-13 10:03:50 +02:00
jimw@mysql.com
a60ed0b75d Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
tulin@dl145b.mysql.com
63aef9d58b Corrected construct of faked Node fail signals in ndb SignalSender 2005-09-12 17:49:48 +02:00
jonas@eel.(none)
40cc9e5c42 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 14:30:52 +02:00
tulin@dl145c.mysql.com
e382a0fb12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-12 14:11:28 +02:00
tulin@dl145c.mysql.com
f80e113d0e removed a few aborts from mgmapi
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
jonas@eel.(none)
a50c9f2d61 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-10 01:50:38 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
9802cc6e58 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-09-09 17:17:44 -04:00
jonas@eel.(none)
1399e061dd Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 19:02:13 +02:00
jonas@eel.(none)
7b0452a141 Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-09 13:53:49 +02:00
jonas@eel.(none)
d70f092aec merge fixes 2005-09-09 13:14:35 +02:00
jonas@eel.(none)
2bd9c2d6f6 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0
2005-09-09 12:54:03 +02:00
jonas@eel.(none)
6ec3fa6ac1 ndb
new testprogram testSRBank
2005-09-09 12:39:06 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
f7957c9819 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-09-09 00:22:36 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
2fdea2c26d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-09-08 22:47:41 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
43f08f752e Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-08 19:28:19 -04:00
konstantin@mysql.com
28d61a05ab Fix -ansi -pedantic compilation failure. 2005-09-09 02:01:04 +04:00
tulin@dl145c.mysql.com
0f4bb8e6ff SignalSender.cpp:
fixed compile error
2005-09-08 19:27:37 +02:00
mronstrom@mysql.com
cd0ae9967c Merge mikael@ndb.mysql.com:/home/mikael/bug12594
into  mysql.com:/Users/mikron/mysql-4.1
2005-09-08 18:30:13 +02:00
mronstrom@mysql.com
43c2bc2f34 Bug #12594: A few fixes 2005-09-08 18:24:42 +02:00
tomas@poseidon.ndb.mysql.com
ffea32c6f3 corrected type 2005-09-08 16:51:35 +02:00
tomas@poseidon.ndb.mysql.com
98a52fa9a4 corrected typo 2005-09-08 16:47:27 +02:00
tomas@poseidon.ndb.mysql.com
b75340e70d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-08 16:44:54 +02:00
tomas@poseidon.ndb.mysql.com
4d534ae24e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-09-08 15:59:06 +02:00
tomas@poseidon.ndb.mysql.com
a6c9ebba47 corrected printouts in backup test 2005-09-08 15:43:46 +02:00