Commit graph

966 commits

Author SHA1 Message Date
joreland@mysql.com
56d1646b9b Fix typos 2004-11-16 07:01:41 +01:00
joreland@mysql.com
2746143aff Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/5.0-ndb-jonas
2004-11-15 21:55:25 +01:00
joreland@mysql.com
13362e6c50 wl2240 - ndb partitioning
- new test program
- changed scan take over protocol
- fixed some bugs
2004-11-15 21:40:35 +01:00
joreland@mysql.com
26bd793133 merge 2004-11-15 11:21:21 +01:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
tomas@poseidon.ndb.mysql.com
09ee973411 ndb_test_platform.cpp:
better printouts in ndb_test_platform
2004-11-11 16:51:38 +00:00
tomas@poseidon.ndb.mysql.com
37d1b4ecd5 waiter.cpp:
fixed so that connectring option works
2004-11-11 16:38:15 +00:00
tomas@poseidon.ndb.mysql.com
399ad08e4f basestring_vsnprintf fix for size==0 2004-11-11 15:53:33 +00:00
pekka@mysql.com
947efdff18 ndb: wl-2066 oops 2004-11-11 16:37:10 +01:00
pekka@mysql.com
18ba569609 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-cc
2004-11-11 14:38:36 +01:00
pekka@mysql.com
1bb314945e ndb: wl-2066 small fix 2004-11-11 14:32:52 +01:00
tomas@poseidon.ndb.mysql.com
e0a3e48f7e forgot a return 0
removed some errorcodes not used
2004-11-11 13:22:33 +00:00
pekka@mysql.com
ad85a10af1 ndb: wl-2066. remove ACC storage. dead code not yet removed 2004-11-11 13:30:59 +01:00
joreland@mysql.com
7549ca56b2 more merge 2004-11-11 12:18:45 +01:00
joreland@mysql.com
2a6bd945fe merge error 2004-11-11 11:50:39 +01:00
tomas@poseidon.ndb.mysql.com
6a9cbe487e added ndb error codes and better explanations 2004-11-11 10:05:28 +00:00
joreland@mysql.com
58ecd9a5cf merge 2004-11-11 10:45:45 +01:00
tomas@poseidon.ndb.mysql.com
17b2d671ee added configure switch for ndb port number
added new variable for ndb port 1186
    changed meaning of ndb_port_base to be default tcp port setting
    changed to use split between port and port_base for ndbcluster
    so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
    added larger space to pid print
    moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
    added c-api to Ndb_mgmclient
    pass also ndb_port to make
2004-11-10 16:05:28 +00:00
tomas@poseidon.ndb.mysql.com
4aa856c2a6 change option -c to refer to connectstring 2004-11-10 14:25:02 +00:00
tomas@poseidon.ndb.mysql.com
f0e4686d3d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-10 07:45:28 +00:00
tomas@poseidon.ndb.mysql.com
761bee8647 added management function to purge stale sessions in the management server 2004-11-09 19:39:29 +00:00
joreland@mysql.com
a889fc4684 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-09 12:00:50 +01:00
joreland@mysql.com
d6860f8502 ndb: compile fix for hpita2-64 bit - remove a bunch of includes 2004-11-09 11:59:28 +01:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
tomas@poseidon.ndb.mysql.com
9b7ea44b26 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-08 14:07:37 +00:00
tomas@poseidon.ndb.mysql.com
17de85dfa6 added ndb test platform test 2004-11-08 13:33:10 +00:00
joreland@mysql.com
ffaa063659 compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
joreland@mysql.com
98e6ddfe4a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 12:45:31 +01:00
tomas@poseidon.ndb.mysql.com
eea1b83b20 Makefile.am:
fix to make make -jN work
2004-11-08 11:28:57 +00:00
joreland@mysql.com
04c8621390 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:53:50 +01:00
tomas@poseidon.ndb.mysql.com
f5b373d678 Makefile.am:
changed make order
.del-Makefile_old~dde91b00b37d2a06:
  Delete: ndb/tools/Makefile_old
.del-Makefile_old~70d769657921a760:
  Delete: ndb/test/tools/Makefile_old
.del-Makefile_old~58f0559822147dd9:
  Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
.del-Makefile_old~4fdb3c92ebd2eb29:
  Delete: ndb/test/run-test/Makefile_old
.del-Makefile_old~1497f81a0c2125e:
  Delete: ndb/test/src/Makefile_old
.del-Makefile_old~fbd3934fabdfe550:
  Delete: ndb/test/ndbapi/Makefile_old
.del-Makefile_old~ec8e48326d4aa09:
  Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
.del-Makefile_old~1046c9ce93ef1fb8:
  Delete: ndb/test/ndbapi/bank/Makefile_old
.del-Makefile_old~7c98d8f1d275983f:
  Delete: ndb/src/ndbapi/Makefile_old
.del-Makefile_old~4463cf06fc2fceb9:
  Delete: ndb/src/mgmapi/Makefile_old
.del-Makefile_old~274925c960801993:
  Delete: ndb/src/mgmsrv/Makefile_old
.del-Makefile_old~b3d33fdde8bc12c0:
  Delete: ndb/src/kernel/Makefile_old
.del-Makefile_old~6dbe2defc7237d4d:
  Delete: ndb/src/kernel/vm/Makefile_old
.del-Makefile_old~cf05571c99011360:
  Delete: ndb/src/kernel/error/Makefile_old
.del-Makefile_old~29a955a7e17d650e:
  Delete: ndb/src/kernel/blocks/Makefile_old
.del-Makefile_old~f8b2a47eb434d43:
  Delete: ndb/src/kernel/blocks/suma/Makefile_old
.del-Makefile_old~f0c05bb23d5c23ca:
  Delete: ndb/src/kernel/blocks/grep/Makefile_old
.del-Makefile_old~a6fd2e579249f6e0:
  Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
.del-Makefile_old~7e8d8b4e2b1fa8f7:
  Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
.del-Makefile_old~73c174fc712803c5:
  Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
.del-Makefile_old~16de31311951fc04:
  Delete: ndb/src/kernel/blocks/trix/Makefile_old
.del-Makefile_old~788c80e5e758ac7:
  Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
.del-Makefile_old~5ebf2b4f85ab09cf:
  Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
.del-Makefile_old~530f9e0bc038a62:
  Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
.del-Makefile_old~315b927180484020:
  Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
.del-Makefile_old~d013a228cad86ba0:
  Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
.del-Makefile_old~c2e33f043b8aa45e:
  Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
.del-Makefile_old~bdf406f5fb4696cb:
  Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
.del-Makefile_old~38a24016d2ad8aa7:
  Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
.del-Makefile_old~2804044250a6fd91:
  Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
.del-Makefile_old~e58eec87cd8dc79e:
  Delete: ndb/src/cw/Makefile_old
.del-Makefile_old~b50c85b8eb69aacb:
  Delete: ndb/src/kernel/blocks/backup/Makefile_old
.del-Makefile_old~16e186623106985e:
  Delete: ndb/src/cw/cpcd/Makefile_old
.del-Makefile_old~f03f74238d640d5:
  Delete: ndb/src/common/mgmcommon/Makefile_old
.del-Makefile_old~a8e9765b520b7c68:
  Delete: ndb/src/common/util/Makefile_old
.del-Makefile_old~9f275aed83c8652b:
  Delete: ndb/src/common/transporter/Makefile_old
.del-Makefile_old~8d901a664eca1ec:
  Delete: ndb/src/common/portlib/Makefile_old
.del-Makefile_old~19643559613c75c7:
  Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
.del-Makefile_old~a3f6fc0e1411bb28:
  Delete: ndb/src/common/logger/Makefile_old
.del-Makefile_old~754f27fab7d4da3b:
  Delete: ndb/src/common/debugger/signaldata/Makefile_old
.del-Makefile_old~54ca8df95719e59f:
  Delete: ndb/src/common/debugger/Makefile_old
2004-11-08 10:35:23 +00:00
joreland@mysql.com
9d8dcdcf72 Merge mysql.com:/home/jonas/src/new-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:26:34 +01:00
joreland@mysql.com
ddff854b90 Merge mysql.com:/home/jonas/src/kalle
into mysql.com:/home/jonas/src/new-fix
2004-11-08 11:24:08 +01:00
tomas@poseidon.ndb.mysql.com
9f999953a2 removed editline and replaced with mysql readline
created new facade object for CommandInterpreter
    removed CPC #if 0 code
    removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
2004-11-08 10:21:39 +00:00
joreland@mysql.com
8acbd6a2ba ndb: bug#6451
1) fix so that missing blob tables don't prevent table from being
    dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
2004-11-08 11:06:36 +01:00
joreland@mysql.com
4ff14f6c59 wl2240 - ndb partitioning
Added create table hook for NDB API test framework
2004-11-07 19:37:11 +01:00
tomas@poseidon.ndb.mysql.com
11d7ba905c wrong copyright 2004-11-07 09:42:27 +00:00
tomas@poseidon.ndb.mysql.com
362febbf29 removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
joreland@mysql.com
b593c0cc8e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-04 21:15:03 +01:00
tomas@poseidon.ndb.mysql.com
d0bb7cc193 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-04 16:25:47 +00:00
tomas@poseidon.ndb.mysql.com
08b25e9901 updated start script for ndbcluster to make better cleanup
changed to use new switch
2004-11-04 15:57:29 +00:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
pekka@mysql.com
7d2047994e NDB bug #6426 fix 2004-11-04 14:06:24 +01:00
pekka@mysql.com
1b81d81b7a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-04 14:06:23 +01:00
tomas@poseidon.ndb.mysql.com
82fb9211b8 correct ndb version
upgrade compatability with 4.1.8
2004-11-04 12:26:49 +00:00
pekka@mysql.com
e14817d8f5 DbaccMain.cpp:
ugly fix for 'quadita2' ia64 icc -O1
2004-11-04 12:14:19 +01:00
joreland@mysql.com
e2763490dd Fix initial chunk size in set_distribution_key for scans 2004-11-04 11:03:05 +01:00
tomas@poseidon.ndb.mysql.com
09501afd53 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-04 08:53:11 +00:00
pekka@mysql.com
b9ec6803ae NDB blobs - try to handle insert-update-delete under autocommit=0 2004-11-03 20:21:56 +01:00
tomas@poseidon.ndb.mysql.com
0fd9d08c01 changed to use the future-proof option to ndb_mgmd
there was a clash in using -c, added -f as the future proof switch
2004-11-03 14:34:21 +00:00