Commit graph

2481 commits

Author SHA1 Message Date
joreland@mysql.com
ebc9d76ddc Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-07 17:09:47 +02:00
joreland@mysql.com
e6dfe6aa36 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-06-07 15:25:21 +02:00
joreland@mysql.com
e697ec1c1c bug#11133 - ndb
incorrect handling of writeTuple with multi op transaction
2005-06-07 15:10:57 +02:00
joreland@mysql.com
60474c8b0b ndb - backup/restore, fix count of dist keys
better fix for bug#10190
2005-06-07 12:50:42 +02:00
joreland@mysql.com
7050d08f18 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-07 10:50:27 +02:00
stewart@mysql.com
ab96501e4c merge 2005-06-07 12:44:00 +10:00
stewart@mysql.com
61ff7d380a BUG#10948 NDB Replication: Race condition with ALTER/DROP table
BUG#9826  Server crash on schema change ("drop table", "alter table") with NDB

See note on 10948 for detailed explanation.

struct a { void* a; long long b[1]; };

on PPC32 (and 32bit pa risc): 16
on x86: 12

so a malloc(sizeof(void*)+extra_bits) is wrong.

Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
are rather expensive on ppc.

Thanks to paulus for doing the PPC port of valgrind.
Without which I would no doubt still be trying to find this.
2005-06-04 18:14:34 +10:00
tulin@dl145b.mysql.com
82d32b88e9 Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-06-02 21:31:25 +02:00
tulin@dl145b.mysql.com
342f6d54a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
2005-06-02 21:25:37 +02:00
tulin@dl145b.mysql.com
72288df8fc CommandInterpreter.cpp:
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
2005-06-02 21:14:14 +02:00
msvensson@neptunus.(none)
f588da546f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb
into neptunus.(none):/home/msvensson/mysql/bug9626
2005-06-02 14:57:46 +02:00
msvensson@neptunus.(none)
daaf6f077e BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
- Remove declaration of MAX_SECTION_SIZE
2005-06-02 14:34:43 +02:00
msvensson@neptunus.(none)
abd3a84f7a BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
- Fix several valgrind warnings.
2005-06-02 14:32:06 +02:00
pekka@mysql.com
786c181f1f ndb - NdbBlob.cpp: add DBUG 2005-06-02 13:40:42 +02:00
tomas@poseidon.ndb.mysql.com
a60bdadb31 Bug #11019 mgmapi start backup in some cases returns wrong backupid 2005-06-02 01:13:23 +02:00
joreland@mysql.com
db0973e910 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-01 13:09:59 +02:00
joreland@mysql.com
7e031804e4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-01 13:07:47 +02:00
joreland@mysql.com
61638019a3 ndb - fix broken ndb_alter_table
reinit AI len after preparing interpreted
2005-06-01 13:05:41 +02:00
joreland@mysql.com
74ffba0c75 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-01 08:03:03 +02:00
joreland@mysql.com
bdd0f5f823 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-01 07:59:48 +02:00
joreland@mysql.com
48f5fae9ff bug#10956 - ndb - more than 7 NR --initial yields cluster failure
a node wo/ filesystem don't have any crashed replicas
  reset noCrashedReplicas in invalidate_node_lcp
2005-05-30 14:17:58 +02:00
joreland@mysql.com
9f499292b9 bug#10953 - ndb - scan read wo/ getvalue cause NF (during NR) 2005-05-30 11:55:47 +02:00
joreland@mysql.com
7a7728494e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-26 22:51:05 +02:00
joreland@mysql.com
b4218497c4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 22:49:49 +02:00
joreland@mysql.com
420ae9a452 ndb - add test case for bug ReadWithoutGetValue 2005-05-26 22:48:28 +02:00
joreland@mysql.com
b0068adc46 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-26 22:43:00 +02:00
joreland@mysql.com
500fdc2d2a merge 2005-05-26 22:42:13 +02:00
joreland@mysql.com
1366e9fa2f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-26 22:22:43 +02:00
joreland@mysql.com
7043d06f16 merge 2005-05-26 22:10:43 +02:00
joreland@mysql.com
bf811eb711 bug#10669 - ndb read wo/ get value
add dummy getvalue
2005-05-26 22:04:50 +02:00
joreland@mysql.com
7be75f0a79 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 21:30:26 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
5178c84bef Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-05-26 18:12:56 +02:00
joreland@mysql.com
8bba533f86 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 14:07:31 +02:00
joreland@mysql.com
7a471f7f69 bug#10190 - ndb
ndb_restore invalid handling of distribution keys when restoring meta data
  (also aligned printout with that of ndb_desc)
2005-05-26 14:03:26 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
5245f98c7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb
into neptunus.(none):/home/msvensson/mysql/bug9626
2005-05-26 12:41:14 +02:00
msvensson@neptunus.(none)
6c00006d2c Fix icc compiler warning 2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
676ba73480 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-26 11:37:19 +02:00
msvensson@neptunus.(none)
f3cc29e93b Fix compiler warning 2005-05-26 11:36:01 +02:00
joreland@mysql.com
9e188eaeb9 ndb - Testcase for bug#10669
--database option to hugo tools
2005-05-26 07:21:05 +02:00
joreland@mysql.com
60d3e60e27 ndb - Embryo of overload protection
Add method to query free send buffer size
2005-05-25 16:19:17 +02:00
joreland@mysql.com
5189e9dd91 ndb autotest - merge jonathans script changes 2005-05-25 11:53:58 +02:00
joreland@mysql.com
c448ab53d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-25 09:26:59 +02:00
joreland@mysql.com
cea14f253d ndb autotest
adopt to changes in auto*tools
2005-05-25 09:22:07 +02:00
stewart@mysql.com
119e500c80 BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly 2005-05-25 15:35:51 +10:00
joreland@mysql.com
83b248f4d5 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-24 17:09:01 +02:00
joreland@mysql.com
6132b0a528 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-24 17:05:20 +02:00
stewart@mysql.com
4de2acd961 BUG#10813 SCI Transporter build fails
fix typo
2005-05-24 11:24:26 +10:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
msvensson@neptunus.(none)
3973e55f49 Build fix 2005-05-23 15:02:02 +02:00
pekka@mysql.com
922a49961d ndb - test progs 2005-05-23 10:24:22 +02:00
pekka@mysql.com
cfb1b90005 ndb - NdbDictionaryImpl.cpp: fix access to freed memory 2005-05-22 20:47:08 +02:00
bell@sanja.is.com.ua
299f06d4fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0
2005-05-20 17:32:36 +03:00
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03:00
monty@mysql.com
0b75f6e37b compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
msvensson@neptunus.(none)
72dcde4111 Merge neptunus.(none):/home/msvensson/mysql/bug9626
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 20:41:23 +02:00
msvensson@neptunus.(none)
920c16c055 BUG#9626 valgrind warnings
- after review fixes
2005-05-19 20:38:48 +02:00
magnus@msdesk.mysql.com
8a0f304375 Fix 2005-05-19 16:00:32 +02:00
msvensson@neptunus.(none)
a996abc594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug9626
2005-05-19 14:53:57 +02:00
msvensson@neptunus.(none)
cb5bfad14e Fix 2005-05-19 12:53:44 +02:00
msvensson@neptunus.(none)
89415d272c Merge 2005-05-18 20:52:59 +02:00
msvensson@neptunus.(none)
2d515425a3 BUG#9626
- Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp
2005-05-18 20:50:29 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
pekka@mysql.com
6dbcd43224 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-05-18 18:05:37 +02:00
pekka@mysql.com
c054f84ae3 ndb - allow upgrade 4.1.10->4.1.12 2005-05-18 17:47:43 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3 ndberror.c:
updated error message for ndb
2005-05-18 10:22:27 +02:00
pekka@mysql.com
3131434dcf ndb - wl-2451 update schemafile format change to 5.0.6 2005-05-15 18:10:30 +02:00
pekka@mysql.com
143ad5081a ndb - testScan -n ScanRead488O fix 2005-05-15 17:56:39 +02:00
joreland@mysql.com
1cd1359049 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-09 21:13:27 +02:00
joreland@mysql.com
5c4da6aa4d merge 2005-05-09 20:28:55 +02:00
joreland@mysql.com
b15797bbaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-09 15:15:25 +02:00
joreland@mysql.com
f2edd8069f bug#10471 - ndb - potential inconsistent backup
whith some multi update scenarios

  Make sure to init GCI on correct operation before firering operation
2005-05-09 14:59:49 +02:00
joreland@mysql.com
a36b2e3953 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 11:04:34 +02:00
joreland@mysql.com
28814b66f4 bug#10142 - ndb unique index resource shortage
honor abort_option as TC now abort on 288
2005-05-09 11:03:07 +02:00
mskold@mysql.com
9e1117c3e5 Merge 2005-05-08 22:52:55 +02:00
mskold@mysql.com
4b06c68d83 Fixes to compile with icc 2005-05-08 22:16:24 +02:00
joreland@mysql.com
40d913612e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-08 20:25:11 +02:00
joreland@mysql.com
caa5cfc63f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-08 20:23:56 +02:00
joreland@mysql.com
a91f302097 ndb - autotest
fix name of result tar ball
2005-05-08 20:23:05 +02:00
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
joreland@mysql.com
b15f8bcbaf Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:39:10 +02:00
joreland@mysql.com
0eb9947ce8 merge 2005-05-07 18:37:59 +02:00
joreland@mysql.com
5455e9ddd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:28:18 +02:00
joreland@mysql.com
347c21fe42 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:22:51 +02:00
joreland@mysql.com
4d1804ebb1 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 18:21:36 +02:00
joreland@mysql.com
749129487e ndb - autotest
fix configs and scripts
2005-05-07 18:20:29 +02:00
ndbdev@ndbmaster.mysql.com
e31a07265f ndb autotest - add show version to cpcd 2005-05-07 16:06:41 +02:00
joreland@mysql.com
678bef34a8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 13:27:06 +02:00
joreland@mysql.com
85066eb0a2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 13:25:52 +02:00
joreland@mysql.com
092eea3a7a ndb - autotest
fixes
2005-05-07 13:23:38 +02:00
joreland@mysql.com
86fe0ecf2d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 12:00:13 +02:00
joreland@mysql.com
74b792b92b merge 2005-05-07 11:56:10 +02:00
joreland@mysql.com
129b3d4ab9 ndb - autotest
upgrades to shell script
2005-05-07 11:53:06 +02:00
pekka@mysql.com
8ccd11182f ndb - bug#8928 2005-05-07 10:56:03 +02:00
joreland@mysql.com
05d21f4ec3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 19:23:11 +02:00
joreland@mysql.com
ff81ca1c05 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 19:22:02 +02:00
joreland@mysql.com
46265f9ad2 ndb - autotest
fix count of nodes needed in test
2005-05-06 19:20:32 +02:00
joreland@mysql.com
575c1edf5b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 18:59:37 +02:00
joreland@mysql.com
44fea2872d ndb - autotest
fix to ndb-autotest.sh
2005-05-06 18:58:46 +02:00
joreland@mysql.com
b76c160184 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 17:27:15 +02:00
joreland@mysql.com
80c2d9574a ndb - autotest
Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads
2005-05-06 17:26:22 +02:00
joreland@mysql.com
c93efc34ae Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 16:44:07 +02:00
joreland@mysql.com
2da6a86845 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:42:49 +02:00
joreland@mysql.com
df5eedb8aa ndb - autotest
put config files in bk
2005-05-06 16:41:46 +02:00
joreland@mysql.com
873ed5e0e7 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 16:16:25 +02:00
joreland@mysql.com
a5629a7ac7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:15:57 +02:00
joreland@mysql.com
df80304435 ndb - autotest
use newly created script for faster handling of several configurations
2005-05-06 16:14:30 +02:00
joreland@mysql.com
9d0c542838 ndb - autotest
update make-config script
2005-05-06 15:37:51 +02:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:15:48 +02:00
joreland@mysql.com
deba12e775 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 14:46:19 +02:00
joreland@mysql.com
749a1f9a2b ndb - add support for mysql servers in autotest 2005-05-06 14:44:43 +02:00
ndbdev@ndbmaster.mysql.com
081933b02e ndb - add support for mysql servers in autotest 2005-05-06 12:46:52 +02:00
stewart@mysql.com
a17bf3f465 Bug#10193
Invalid DataDir in config causes ndbd segfault
2005-05-06 10:43:29 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
joreland@mysql.com
e1dad7a21b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-05 11:11:03 +02:00
joreland@mysql.com
3ebc4a271f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-05 11:09:50 +02:00
joreland@mysql.com
208e534acc ndb - testNodeRestart -n LateCommit
increase no of rows so that the node failure will "guaranteed" produce an aborted transaction
2005-05-05 11:09:00 +02:00
joreland@mysql.com
1f58420332 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-05 10:41:04 +02:00
joreland@mysql.com
15bfe83479 merge 2005-05-05 10:39:20 +02:00
joreland@mysql.com
4238092864 bug#10142 - ndb unique index
post review fixes
2005-05-05 10:34:39 +02:00
joreland@mysql.com
97feb2df6a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 18:58:41 +02:00
joreland@mysql.com
a1faad1e64 merge 2005-05-04 18:48:33 +02:00
joreland@mysql.com
bf6e779b84 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 18:43:40 +02:00
joreland@mysql.com
0d17895910 bug#10358 - ndb
Cluster failure with non started nodes can result in timedout transactions
2005-05-04 18:40:54 +02:00
joreland@mysql.com
9ca0423435 merge 2005-05-04 17:29:41 +02:00
joreland@mysql.com
4a29d5b30e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 14:32:09 +02:00
joreland@mysql.com
86c7c4d1e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-04 14:29:33 +02:00
joreland@mysql.com
ef23f4295f bug#10330 - linking with ndb fails
changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places
2005-05-04 13:29:15 +02:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok:
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
2005-05-04 10:16:03 +02:00
joreland@mysql.com
7ebc32ee8b bug#10142 - ndb unhandle resource shortage in unique index code 2005-05-03 12:16:31 +02:00
joreland@mysql.com
74bf65d0e9 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-02 15:16:40 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
joreland@mysql.com
4766b99ec6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-28 06:57:59 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
joreland@mysql.com
d6f80c436c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-27 07:56:37 +02:00
pekka@mysql.com
f30749a08e ndb - wl#2455 fix 2005-04-25 12:55:24 +02:00
joreland@mysql.com
9572e1b72b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 12:01:03 +02:00
joreland@mysql.com
004ec3838d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 11:59:50 +02:00
joreland@mysql.com
280bef1845 bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.
2005-04-25 11:59:00 +02:00
joreland@mysql.com
208200cbe0 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 08:45:12 +02:00
joreland@mysql.com
b57eab4377 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:44:05 +02:00
joreland@mysql.com
12e0d4f588 ndb - autotest
add more tests to verify correctness of backups
2005-04-25 08:43:16 +02:00
joreland@mysql.com
9f0a7e1729 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 08:39:36 +02:00
joreland@mysql.com
c4d44841c4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:38:28 +02:00
joreland@mysql.com
763d835a3c bug#9924 - ndb backup
remove incorrect assertion
2005-04-25 08:35:18 +02:00
joreland@mysql.com
08b7219de0 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-24 20:39:42 +02:00
joreland@mysql.com
e1e050432d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:38:53 +02:00
joreland@mysql.com
798e78787c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:37:31 +02:00
joreland@mysql.com
d9d1c933b0 bug#9924 - ndb backup - abort handling
uninit variable
2005-04-24 20:34:42 +02:00
pekka@mysql.com
48d6d545c0 ndb - post merge 4.1->5.0 2005-04-23 18:51:18 +02:00
pekka@mysql.com
850211eb73 Merge 2005-04-23 17:55:21 +02:00
pekka@mysql.com
6778b029e0 ndb - bug#10029 fix 2005-04-23 17:33:12 +02:00
pekka@mysql.com
9856a3e818 ndb - wl#2455 cont'd 2005-04-22 13:59:35 +02:00
joreland@mysql.com
cde3ff4d26 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-22 13:20:47 +02:00
joreland@mysql.com
c768e1d1e7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 13:07:35 +02:00
joreland@mysql.com
c770807edd Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 12:57:05 +02:00
joreland@mysql.com
3294a34ed2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 12:53:07 +02:00
pekka@mysql.com
4ff9b53b41 ndb - wl#2455 cont'd 2005-04-22 12:35:31 +02:00
joreland@mysql.com
c9d149fafe Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 11:13:56 +02:00
joreland@mysql.com
5f5f25c0bc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 11:12:08 +02:00
joreland@mysql.com
0bfc924672 bug#9724 - ndb restart
if file already open occur print files...
2005-04-22 11:04:26 +02:00
joreland@mysql.com
8b07d761bc Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 09:51:13 +02:00
joreland@mysql.com
325918ee31 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 09:47:12 +02:00
joreland@mysql.com
bbd0aa6cc3 bug#9969 - ndb
missleading error message
2005-04-22 09:40:44 +02:00
joreland@mysql.com
2ce7824e3f merge 2005-04-22 09:30:23 +02:00
joreland@mysql.com
e6142c477c bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours
2005-04-22 09:07:25 +02:00
mskold@mysql.com
b1c8e44ead Merge 2005-04-21 10:26:14 +02:00
mskold@mysql.com
e0fe3e75c7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
pekka@mysql.com
737a866faa ndb - dbug aid for api signal log 2005-04-20 16:09:00 +02:00
mskold@mysql.com
c9e68705bb Removed forgotten abort() call, bug#10001 2005-04-20 11:08:53 +02:00
joreland@mysql.com
2a482eaf6f wl2455 - ndb tup scan
fix broken NR
2005-04-19 13:43:57 +02:00
joreland@mysql.com
2df2c4b895 CSC5149 - ndb test programs
Fix src distributions for benchmark prg
2005-04-19 11:17:32 +02:00
joreland@mysql.com
759298fda2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-19 11:06:11 +02:00
joreland@mysql.com
3dc5b1c90d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-18 12:47:47 +02:00
joreland@mysql.com
c0248b2186 bug#9892 - ndb index activation
4.1->5.0 merge fix
2005-04-18 12:46:35 +02:00
joreland@mysql.com
78d0b4526f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-18 12:45:17 +02:00
joreland@mysql.com
f931466f36 bug#9892
Make BUILDINDX RF_LOCAL aware
2005-04-18 12:41:12 +02:00
pekka@mysql.com
b485ce3dd5 ndb - use words not pages in schemafile table entry (5.1 compatible) 2005-04-17 19:01:18 +02:00
pekka@mysql.com
9ac0394446 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-04-14 22:27:43 +02:00
heikki@hundin.mysql.fi
31a49c3f73 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-14 22:33:17 +03:00
joreland@mysql.com
92c3f83528 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-14 13:46:32 +02:00
joreland@mysql.com
6799266b99 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-14 13:45:35 +02:00
joreland@mysql.com
27f7a6c41b BUG#9891 - ndb lcp
Crash if ACC_CONTOPREQ was sent while ACC_LCPCONF was in job buffer
  if ACC_LCPCONF would have arrived eariler (before TUP_LCPSTARTED)
  operations could lockup. 
  But would be restarted on next LCP

-- LQH
1) Better check for LCP started that will also return true
   if ACC or TUP already has completed
    
2) Remove incorrect if statement that prevented operations to
   be started if ACC has completed

-- ACC
Make sure all ACC_CONTOPCONF are sent before releasing lcp record
  i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)

Check for == 4 also when sending ACC_CONTOPCONF
2005-04-14 13:43:07 +02:00
joreland@mysql.com
5ffca20dcc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-14 13:32:38 +02:00
pekka@mysql.com
90a9342506 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-04-14 05:39:22 +02:00
pekka@mysql.com
768b1da09b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-04-14 05:01:44 +02:00
mskold@mysql.com
add3fd3cca Merge 2005-04-13 16:24:17 +02:00
mskold@mysql.com
e39ba63934 Merge 2005-04-13 14:08:54 +02:00
pekka@mysql.com
3c0a885fed ndb - bug#9865 fix error message 2005-04-13 13:40:53 +02:00
mskold@mysql.com
f5855f2d57 Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit 2005-04-13 12:42:23 +02:00
joreland@mysql.com
45a07db5c0 BUG#9749 - ndb lock upgrade - more fixes...
1) Make getNoParall into function instead of a procedure
2) Check for multiple transactions in "upgrade's" parallell queue
3) Set lock mode according to lock_owner's lockMode

NOTE: Does still not handle lock upgrade in case of aborts correctly
2005-04-13 09:54:40 +02:00
joreland@mysql.com
210a1fe5cc Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-13 07:43:03 +02:00
joreland@mysql.com
39e750d949 bug#9749 - ndb lock upgrade
handle more cases...
2005-04-12 17:54:34 +02:00
joreland@mysql.com
2e1e670b57 bug#9757 - ndb - post review
use DBUG_RETURN
2005-04-12 13:56:24 +02:00
joreland@mysql.com
8f0f041e64 bug#9757 - ndb
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
  Add some more dump
2005-04-12 13:36:43 +02:00
joreland@mysql.com
bd1c0ee2c0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-11 14:31:14 +02:00
joreland@mysql.com
bb8dd31b63 ndb - replication bug fix
Fix gci reply on TC_COMMITREQ
  (prefered way of mysqld)
2005-04-11 14:29:30 +02:00
pekka@mysql.com
fd5b9f7ed7 ndb - csc#4847 - manual merge 4.1->5.0 2005-04-11 12:43:58 +02:00
joreland@mysql.com
588559e3d8 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-11 10:26:18 +02:00
joreland@mysql.com
ed95158337 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-11 10:22:30 +02:00
pekka@mysql.com
ad92514d66 ndb - wl-2451: Increase max schema object to > 1600 2005-04-10 22:43:17 +02:00
pekka@mysql.com
dbae73bfa8 ndb - testOIBasic.cpp: 4.1->5.0 fix 2005-04-10 07:55:30 +02:00
joreland@mysql.com
d8a5305d0d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-08 14:16:57 +02:00
joreland@mysql.com
72d89cc253 bug#9749 - ndb
test case for case 9749, ndb lock upgrade via NDBAPI
2005-04-08 14:15:37 +02:00
mskold@mysql.com
e66eaaa2a0 Merge 2005-04-07 18:37:04 +02:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
mskold@mysql.com
934f458140 Added missing DBUG_RETURNs 2005-04-07 12:12:03 +02:00
pekka@mysql.com
4c1e923846 ndb - DbtupScan.cpp added 2005-04-07 11:28:43 +02:00
pekka@mysql.com
4b75cf3d32 ndb - wl-2455 TUP scan for testing in 5.0 2005-04-07 11:15:34 +02:00
serg@serg.mylan
5cd866610d after merge fix 2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea manually merged
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
pekka@mysql.com
114b421c8b ndb - csc#4847 release scan op early to save memory 2005-04-05 13:14:03 +02:00
pekka@mysql.com
7a29a92ac4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50-ndb
2005-04-05 10:01:12 +02:00
pekka@mysql.com
328b453c86 merge 2005-04-01 11:21:55 +02:00
pekka@mysql.com
5b9bd8c0c8 Merge 2005-04-01 10:13:37 +02:00
mskold@mysql.com
b5e57be56b Fixed so no merge conflict with 5.0 2005-03-31 19:18:50 +02:00
pekka@mysql.com
af63ce9d22 ndb - fix small memory leak 2005-03-31 16:22:46 +02:00
mskold@mysql.com
75a4dc9644 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-31 14:33:51 +02:00
mskold@mysql.com
9795e7eda9 Removed warnings 2005-03-31 14:31:06 +02:00
pekka@mysql.com
10a03ce6c8 ndb - CSC#4927: ordered index + long pk, second half 2005-03-30 22:17:11 +02:00
joreland@mysql.com
738b9f9b8c Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-29 12:04:57 +02:00
joreland@mysql.com
9642b95c6c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-29 12:02:28 +02:00
joreland@mysql.com
f83a426cf2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-29 12:00:43 +02:00
monty@mysql.com
c4467b817d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
monty@mysql.com
dd4b0710dd Cleanups during review 2005-03-29 12:37:36 +03:00
pekka@mysql.com
a259bcebd7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-03-28 22:56:40 +02:00
pekka@mysql.com
5dea61b879 ndb - set up long key page vars in ACC_LOCKREQ (bug#????) 2005-03-28 22:55:32 +02:00
pekka@mysql.com
2a428a1af9 Merge mysql.com:/export/space/pekka/ndb/version/my41
into mysql.com:/export/space/pekka/ndb/version/my50
2005-03-28 11:52:16 +02:00
pekka@mysql.com
42a641ffde ndb - make printSchemaFile available (compile manually) 2005-03-28 11:51:31 +02:00
jimw@mysql.com
dee535be63 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 10:51:08 -08:00
jimw@mysql.com
4f19826d80 Merge mysql.com:/home/jimw/my/mysql-4.1-9323
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:58 -08:00
joreland@mysql.com
7fbe97d36e ndb - super pool - compile fix
remove extra qualification which picky gcc complains about
2005-03-23 09:09:13 +01:00
joreland@mysql.com
394b62966f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-23 08:18:53 +01:00
joreland@mysql.com
ad9bfaeba9 merge 2005-03-23 08:12:52 +01:00
joreland@mysql.com
b2c9ab4bb2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-23 08:08:05 +01:00
joreland@mysql.com
e20ff10bd2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-23 07:58:25 +01:00
jimw@mysql.com
0842efeab2 Fix calls to memset() with arguments out of order. (Bug #9323) 2005-03-22 16:00:02 -08:00
mskold@mysql.com
68e5cf494e Merged 2005-03-22 22:31:51 +01:00
mskold@mysql.com
9347abfe8d Simplified rounding up to nearest 64-bit boundry 2005-03-22 22:12:24 +01:00
mskold@mysql.com
27dbed4384 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
pekka@mysql.com
743dae5e23 ndb - common pool for records 2005-03-21 12:01:25 +01:00
joreland@mysql.com
3db6607c8b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-20 21:18:22 +01:00
joreland@mysql.com
182d0453db merge 2005-03-20 20:11:44 +01:00
joreland@mysql.com
edaf9d6177 ndb -
Fix uninit variable (potential segv) in Dbacc::sendNextScanConf
  discovered by magnus addition in "globals_list"
2005-03-20 20:07:12 +01:00
joreland@mysql.com
702883616e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-19 13:47:38 +01:00
joerg@mysql.com
9d0b81880c Manual merge: Do not re-use the same identifier at loop level within a function (IRIX!). 2005-03-16 17:05:07 +01:00
joerg@mysql.com
29a78e7e88 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-16 16:44:31 +01:00
mskold@mysql.com
41cddfe6f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-03-16 11:33:02 +01:00
joreland@mysql.com
642bcfed5a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-16 09:45:27 +01:00
joreland@mysql.com
bd9746b24b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-16 09:44:39 +01:00
mskold@mysql.com
057d78650e Fix for bug#9166: Cluster compile failure on Solaris 10 2005-03-15 22:19:55 +01:00
joreland@mysql.com
8796bfe5de Merge 2005-03-15 21:08:28 +01:00
joreland@mysql.com
9ab5f5c0d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-15 20:17:00 +01:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
joerg@mysql.com
281af2f9bc Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX). 2005-03-15 12:40:28 +01:00
pekka@mysql.com
d8d8cf1f72 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/pekka/ndb/version/my50
2005-03-15 12:06:29 +01:00
pekka@mysql.com
23355a3c95 ndb - valgrind/compile fix Transporter.cpp: missing return 2005-03-15 12:01:41 +01:00
joerg@mysql.com
74708ae075 Avoid compilation error: On IRIX, identifiers with loop scope still need to be unique
at function level.
2005-03-15 11:55:27 +01:00
msvensson@neptunus.(none)
93831e4c91 Removed faulty impl. 2005-03-10 13:09:41 +01:00
msvensson@neptunus.(none)
792cab1973 Garbage "global" local variables in Dbacc 2005-03-10 13:06:22 +01:00
tomas@poseidon.ndb.mysql.com
59389925ba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-10 11:33:36 +01:00
msvensson@neptunus.(none)
19cc402624 Fix uninitialised variable in Dbacc 2005-03-10 10:46:19 +01:00
joreland@mysql.com
f2f36ea64f Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-10 08:26:14 +01:00
heikki@hundin.mysql.fi
bfb5d79eb3 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-10 09:07:42 +02:00
joreland@mysql.com
87c93bc514 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-10 07:48:44 +01:00
joreland@mysql.com
364b3b7b9b bug#9089
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
2005-03-10 07:45:17 +01:00
tomas@poseidon.ndb.mysql.com
3e95113461 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-09 21:19:57 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
joreland@mysql.com
5250f4b8bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-09 11:50:31 +01:00
tomas@poseidon.ndb.mysql.com
70a9055d6a fixed mem leak in subscriction handling in Suma
debug printouts
    ndb documentation update
2005-03-09 11:49:48 +01:00
joreland@mysql.com
22788b492a Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-09 07:50:46 +01:00
joreland@mysql.com
241c5e1046 bug#9052 - ndb - Use correct length during unique index build
(recommit as 4.1->5.0 merge is not possible)
2005-03-09 07:49:03 +01:00
tomas@poseidon.ndb.mysql.com
b87f470104 added testcase for multiple tables and events 2005-03-09 01:22:12 +01:00
tomas@poseidon.ndb.mysql.com
94dc32b37a fixed bug in event handling of several tables
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
2005-03-09 01:00:08 +01:00
joreland@mysql.com
c66c2a747f bug#9052 - ndb - Use correct length during unique index build 2005-03-08 15:26:34 +01:00
joreland@mysql.com
fcd7b0ebc6 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:27:37 +01:00
joreland@mysql.com
56bc9cfacb bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout 2005-03-08 10:25:21 +01:00
tomas@poseidon.ndb.mysql.com
95412d8c17 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-07 21:33:02 +01:00
tomas@poseidon.ndb.mysql.com
fce9386016 added test compare function for testing event
fixed one bug in event, pk comes first in events...
2005-03-07 18:47:47 +01:00
pekka@mysql.com
3a346382cc ndb - remove obsolete attribute storage type ACC vs TUP 2005-03-06 14:09:28 +01:00
tomas@poseidon.ndb.mysql.com
0d6947de5b make sure the own node is set as connected... 2005-03-04 20:21:02 +01:00
tomas@poseidon.ndb.mysql.com
473462f3ba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-04 12:23:17 +01:00
tomas@poseidon.ndb.mysql.com
eb41f3f74f changed order of transporter_connect and closing the mgmapisession 2005-03-04 12:19:53 +01:00
tomas@poseidon.ndb.mysql.com
d360786e45 get connected nodes correct earlier for correct node id allocation 2005-03-04 09:55:16 +01:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
tomas@poseidon.ndb.mysql.com
358ba900ef updated example makefiles to add libmystrings
temporary added trace printouts for ndb autotest
2005-03-03 20:21:45 +01:00
tomas@poseidon.ndb.mysql.com
34c5892c44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 18:36:31 +01:00
tomas@poseidon.ndb.mysql.com
04cd65b91a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 17:29:22 +01:00
stewart@mysql.com
59f32b3da7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
2005-03-04 03:11:44 +11:00
pekka@mysql.com
59ffe5bdf8 ndb - bug#8876 third and final solution 2005-03-03 12:45:49 +01:00
pekka@mysql.com
e90c122891 ndb - bug#8876 2005-03-03 11:38:50 +01:00
tomas@poseidon.ndb.mysql.com
0169c29425 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 09:55:04 +01:00
tomas@poseidon.ndb.mysql.com
3d4ac142fc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-03 09:52:25 +01:00
stewart@mysql.com
f2856134bf Add ndb/src/mgmapi/mgmapi_internal.h
move internal mgmapi functions into it.

should also fix AIX build problem.
2005-03-03 19:49:58 +11:00
joreland@mysql.com
50a69b1b5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-03 08:52:44 +01:00
joreland@mysql.com
0683340ec9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-03 08:38:10 +01:00
joreland@mysql.com
744509d6c0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-03 08:35:55 +01:00
pekka@mysql.com
20fe3934af ndb - bug#8876 2005-03-03 01:07:03 +01:00
joerg@mysql.com
39ac2c0108 Variable 'k' declared at both loop and function level caused compiler failures -
use function-wide declaration also for loop body.
2005-03-02 11:47:09 +01:00
tomas@poseidon.ndb.mysql.com
a60ae957bb Makefile.am:
updated ndb test makefile to make src dist complete
2005-03-02 00:25:16 +01:00
tomas@poseidon.ndb.mysql.com
d8b6a2dcf4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-01 22:30:48 +01:00
joreland@mysql.com
06b6798b0c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-01 13:41:22 +01:00
joreland@mysql.com
12d0ac07db merge 2005-03-01 13:39:22 +01:00
joreland@mysql.com
e9feed9751 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-01 13:35:57 +01:00
joreland@mysql.com
afdbf9b4a4 bug#8853 - ndb - commit after nodefailure on not TC node
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep
2005-03-01 13:32:11 +01:00
stewart@mysql.com
5e2c038339 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
2005-03-01 19:56:24 +11:00
stewart@mysql.com
7fda68612d Fixes from Tomas's review of 'use configuration mgm handle as a transporter'.
This should help with the  PURGE STALE SESSIONS problem.
2005-03-01 19:53:57 +11:00
pekka@mysql.com
0df7b6317c Merge mysql.com:/space/pekka/ndb/version/my50
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-27 17:25:31 +01:00
pekka@mysql.com
21ca91aac6 ndb - bugfix to ordered index create, could show up as charset error 2005-02-27 17:24:18 +01:00
pekka@mysql.com
cdd0b62a21 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-26 18:01:15 +01:00
pekka@mysql.com
645f5733e6 NdbDictionaryImpl.cpp:
fix error code
2005-02-26 17:59:23 +01:00
pekka@mysql.com
91eaf92861 ndb - wl-1203 alignment fix 2005-02-26 16:56:39 +01:00
mskold@mysql.com
78627e1ab1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-25 13:21:17 +01:00
joreland@mysql.com
d51fa996ab Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 09:15:52 +01:00
joreland@mysql.com
b52ed0d669 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-25 09:14:43 +01:00
joreland@mysql.com
72127b52b3 BUG#8786 - ndb_autodiscover, post review
More explicit naming of variables
2005-02-25 09:10:35 +01:00
tomas@poseidon.ndb.mysql.com
2cd8ec2f45 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-02-24 22:10:03 +01:00
tomas@poseidon.ndb.mysql.com
e0de89d0a4 NdbDictionaryImpl.cpp:
debug printouts
2005-02-24 22:09:25 +01:00
joreland@mysql.com
9905a52011 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:58:26 +01:00
joreland@mysql.com
1029db2b6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:57:32 +01:00
joreland@mysql.com
bed5d6e418 bug#8786 - ndb_autodiscover - 5.0 specific details
Wait some for all nodes to get connected
2005-02-24 20:56:59 +01:00
joreland@mysql.com
0a265b6d84 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:48:33 +01:00
joreland@mysql.com
168847b8e1 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 19:01:36 +01:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails
remove dict forwarding
  add api retries on NotMaster
2005-02-24 18:58:56 +01:00
pekka@mysql.com
8b8dc46513 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-24 13:07:34 +01:00
pekka@mysql.com
b67f82d901 ndb - wl-1203 fix binary LIKE binary in ndb api 2005-02-24 13:07:33 +01:00
stewart@mysql.com
e94e9fa644 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
2005-02-24 18:46:13 +11:00
stewart@mysql.com
336f4cc808 Fixes for: use initial mgm connection as transporter connection 2005-02-24 17:57:22 +11:00
joreland@mysql.com
2952f73c16 merge 2005-02-24 06:24:46 +01:00
joreland@mysql.com
b90e9e4cc9 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 06:19:41 +01:00
joreland@mysql.com
00625adadc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 06:18:02 +01:00
joreland@mysql.com
87402eb5bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 06:14:43 +01:00
mskold@mysql.com
9e1b72d03d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 17:20:01 +01:00
tomas@poseidon.ndb.mysql.com
bed049b061 added testcase for events where a "shadow table" is created 2005-02-23 16:57:07 +01:00
mskold@mysql.com
364492239b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 15:54:22 +01:00
stewart@mysql.com
e88eba65a7 Use the mgm connection used for fetching configuration as a transporter. 2005-02-23 21:07:22 +11:00
tomas@poseidon.ndb.mysql.com
5a7f3ce9c1 Merge 2005-02-23 10:29:31 +01:00
tomas@poseidon.ndb.mysql.com
66043d568d Merge 2005-02-23 10:16:56 +01:00
tomas@poseidon.ndb.mysql.com
ce6ffc3dcc removed printout "- Repeated 1 times"
make sure transporter connections are close early in shutdown
2005-02-23 10:12:26 +01:00
tomas@poseidon.ndb.mysql.com
15bb6b9812 fixed bug that event subscriptions are not dropped correctly on api failure
+ added debug printout
2005-02-22 23:28:54 +01:00
tomas@poseidon.ndb.mysql.com
8751c89c30 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-02-22 18:29:57 +01:00
tomas@poseidon.ndb.mysql.com
195de8516d making sure that the client connect loop and server accept is stopped early at ndbd shutdown 2005-02-22 18:28:53 +01:00
joreland@mysql.com
8ab7fd9a97 ndb - move benchmark to basic suite 2005-02-22 13:58:25 +01:00
joreland@mysql.com
2ff69100ad Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 12:18:39 +01:00
joreland@mysql.com
4eaf1db4b8 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 12:17:27 +01:00