Commit graph

936 commits

Author SHA1 Message Date
unknown
6049821cd0 wl1744 - win compile fixes
ndb/include/kernel/signaldata/RepImpl.hpp:
  more win-compile-fixes
ndb/include/mgmapi/mgmapi.h:
  more win-compile-fixes
ndb/include/ndbapi/NdbConnection.hpp:
  more win-compile-fixes
ndb/src/common/util/Properties.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/grep/Grep.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/Config.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbBlob.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbConnection.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbImpl.hpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbOperationExec.cpp:
  more win-compile-fixes
ndb/test/ndbapi/testOperations.cpp:
  more win-compile-fixes
sql/ha_ndbcluster.cc:
  more win-compile-fixes
2004-11-10 00:39:12 +01:00
unknown
59ee75bd57 wl1744 - fix compiler problems
ndb/include/debugger/GrepError.hpp:
  prexif
ndb/include/kernel/LogLevel.hpp:
  fix correct type prototype
ndb/include/kernel/signaldata/FsCloseReq.hpp:
  remove usage of true
ndb/include/mgmapi/mgmapi.h:
  use Uint64 instead of long long
ndb/include/mgmcommon/IPCConfig.hpp:
  correct type
ndb/include/portlib/NdbTCP.h:
  fix #elif
ndb/include/transporter/TransporterRegistry.hpp:
  correct type
ndb/include/util/Parser.hpp:
  correct type
  made stuff public as vc++ couldn't handle template friends
ndb/include/util/SimpleProperties.hpp:
  correct type
ndb/src/common/debugger/EventLogger.cpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/common/debugger/GrepError.cpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/common/debugger/signaldata/FsCloseReq.cpp:
  removed usage of true
ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  removed usage of true
ndb/src/common/logger/LogHandlerList.hpp:
  use ndb_global
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed ConfigRetriever::get_config(file) from windows
ndb/src/common/transporter/TransporterRegistry.cpp:
  interface is a reserved word in vc++
ndb/src/kernel/blocks/grep/Grep.hpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/kernel/vm/Configuration.cpp:
  Use BaseString::snprintf
ndb/src/kernel/vm/Configuration.hpp:
  correct type
ndb/src/kernel/vm/SimplePropertiesSection.cpp:
  correct type
ndb/src/mgmapi/mgmapi_configuration.cpp:
  use Uin6t4
ndb/src/mgmapi/mgmapi_configuration.hpp:
  use Uin6t4
ndb/src/mgmsrv/ConfigInfo.cpp:
  Prefix
ndb/src/mgmsrv/ConfigInfo.hpp:
  prefix
ndb/src/ndbapi/Ndb.cpp:
  removed usued include
ndb/src/ndbapi/NdbImpl.hpp:
  prefix
ndb/src/ndbapi/ObjectMap.hpp:
  Better typecast
2004-11-10 00:13:26 +01:00
unknown
f0614a9fec wl1744 - ndb on windows
Add rules for creating dsp-files
2004-11-10 00:03:01 +01:00
unknown
daa71e1996 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
unknown
be0933aa7d ndb: compile fix for hpita2-64 bit - remove a bunch of includes 2004-11-09 11:59:28 +01:00
unknown
415221f3f1 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
unknown
a3503c7505 added ndb test platform test 2004-11-08 13:33:10 +00:00
unknown
2f182b3eb0 compile fix for ndbapi test program on irix (variable scope)
ndb/test/include/NDBT_Test.hpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/ScanFunctions.hpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testDataBuffers.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testDeadlock.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testDict.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testIndex.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testLcp.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testNdbApi.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testOIBasic.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testReadPerf.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testRestartGci.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testScanPerf.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testSystemRestart.cpp:
  compile fix for ndbapi test program on irix
2004-11-08 13:59:04 +01:00
unknown
70663052d8 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
unknown
369845a46c Makefile.am:
fix to make make -jN work


ndb/src/mgmclient/Makefile.am:
  fix to make make -jN work
2004-11-08 11:28:57 +00:00
unknown
1490901ecc 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
unknown
d03f2330aa 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


BitKeeper/deleted/.del-Makefile_old~54ca8df95719e59f:
  Delete: ndb/src/common/debugger/Makefile_old
BitKeeper/deleted/.del-Makefile_old~754f27fab7d4da3b:
  Delete: ndb/src/common/debugger/signaldata/Makefile_old
BitKeeper/deleted/.del-Makefile_old~a3f6fc0e1411bb28:
  Delete: ndb/src/common/logger/Makefile_old
BitKeeper/deleted/.del-Makefile_old~19643559613c75c7:
  Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
BitKeeper/deleted/.del-Makefile_old~8d901a664eca1ec:
  Delete: ndb/src/common/portlib/Makefile_old
BitKeeper/deleted/.del-Makefile_old~9f275aed83c8652b:
  Delete: ndb/src/common/transporter/Makefile_old
BitKeeper/deleted/.del-Makefile_old~a8e9765b520b7c68:
  Delete: ndb/src/common/util/Makefile_old
BitKeeper/deleted/.del-Makefile_old~f03f74238d640d5:
  Delete: ndb/src/common/mgmcommon/Makefile_old
BitKeeper/deleted/.del-Makefile_old~16e186623106985e:
  Delete: ndb/src/cw/cpcd/Makefile_old
BitKeeper/deleted/.del-Makefile_old~b50c85b8eb69aacb:
  Delete: ndb/src/kernel/blocks/backup/Makefile_old
BitKeeper/deleted/.del-Makefile_old~e58eec87cd8dc79e:
  Delete: ndb/src/cw/Makefile_old
BitKeeper/deleted/.del-Makefile_old~2804044250a6fd91:
  Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
BitKeeper/deleted/.del-Makefile_old~38a24016d2ad8aa7:
  Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
BitKeeper/deleted/.del-Makefile_old~bdf406f5fb4696cb:
  Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
BitKeeper/deleted/.del-Makefile_old~c2e33f043b8aa45e:
  Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~d013a228cad86ba0:
  Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
BitKeeper/deleted/.del-Makefile_old~315b927180484020:
  Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
BitKeeper/deleted/.del-Makefile_old~530f9e0bc038a62:
  Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
BitKeeper/deleted/.del-Makefile_old~5ebf2b4f85ab09cf:
  Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
BitKeeper/deleted/.del-Makefile_old~788c80e5e758ac7:
  Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
BitKeeper/deleted/.del-Makefile_old~16de31311951fc04:
  Delete: ndb/src/kernel/blocks/trix/Makefile_old
BitKeeper/deleted/.del-Makefile_old~73c174fc712803c5:
  Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
BitKeeper/deleted/.del-Makefile_old~7e8d8b4e2b1fa8f7:
  Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
BitKeeper/deleted/.del-Makefile_old~a6fd2e579249f6e0:
  Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
BitKeeper/deleted/.del-Makefile_old~f0c05bb23d5c23ca:
  Delete: ndb/src/kernel/blocks/grep/Makefile_old
BitKeeper/deleted/.del-Makefile_old~f8b2a47eb434d43:
  Delete: ndb/src/kernel/blocks/suma/Makefile_old
BitKeeper/deleted/.del-Makefile_old~29a955a7e17d650e:
  Delete: ndb/src/kernel/blocks/Makefile_old
BitKeeper/deleted/.del-Makefile_old~cf05571c99011360:
  Delete: ndb/src/kernel/error/Makefile_old
BitKeeper/deleted/.del-Makefile_old~6dbe2defc7237d4d:
  Delete: ndb/src/kernel/vm/Makefile_old
BitKeeper/deleted/.del-Makefile_old~b3d33fdde8bc12c0:
  Delete: ndb/src/kernel/Makefile_old
BitKeeper/deleted/.del-Makefile_old~274925c960801993:
  Delete: ndb/src/mgmsrv/Makefile_old
BitKeeper/deleted/.del-Makefile_old~4463cf06fc2fceb9:
  Delete: ndb/src/mgmapi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~7c98d8f1d275983f:
  Delete: ndb/src/ndbapi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~1046c9ce93ef1fb8:
  Delete: ndb/test/ndbapi/bank/Makefile_old
BitKeeper/deleted/.del-Makefile_old~ec8e48326d4aa09:
  Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
BitKeeper/deleted/.del-Makefile_old~fbd3934fabdfe550:
  Delete: ndb/test/ndbapi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~1497f81a0c2125e:
  Delete: ndb/test/src/Makefile_old
BitKeeper/deleted/.del-Makefile_old~4fdb3c92ebd2eb29:
  Delete: ndb/test/run-test/Makefile_old
BitKeeper/deleted/.del-Makefile_old~58f0559822147dd9:
  Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
BitKeeper/deleted/.del-Makefile_old~70d769657921a760:
  Delete: ndb/test/tools/Makefile_old
BitKeeper/deleted/.del-Makefile_old~dde91b00b37d2a06:
  Delete: ndb/tools/Makefile_old
ndb/src/mgmclient/Makefile.am:
  changed make order
2004-11-08 10:35:23 +00:00
unknown
1489c41711 Merge mysql.com:/home/jonas/src/new-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-11-08 11:26:34 +01:00
unknown
85ce991973 Merge mysql.com:/home/jonas/src/kalle
into mysql.com:/home/jonas/src/new-fix


ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
2004-11-08 11:24:08 +01:00
unknown
5fb792ec40 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


BitKeeper/deleted/.del-MANIFEST~e8c948c4a4413f8d:
  Delete: ndb/src/common/editline/MANIFEST
BitKeeper/deleted/.del-Makefile.am~dfbe493d6e2d25f4:
  Delete: ndb/src/common/editline/Makefile.am
BitKeeper/deleted/.del-Makefile_old~90ac19a1668ecdd5:
  Delete: ndb/src/common/editline/Makefile_old
BitKeeper/deleted/.del-README~3f39f9b8294466e8:
  Delete: ndb/src/common/editline/README
BitKeeper/deleted/.del-complete.c~a1bc3055fd90e27f:
  Delete: ndb/src/common/editline/complete.c
BitKeeper/deleted/.del-editline.3~1f9bb4274cf4381:
  Delete: ndb/src/common/editline/editline.3
BitKeeper/deleted/.del-editline.c~5b759f3e5fd3c196:
  Delete: ndb/src/common/editline/editline.c
BitKeeper/deleted/.del-editline_internal.h~96ca8d53fb758586:
  Delete: ndb/src/common/editline/editline_internal.h
BitKeeper/deleted/.del-editline_win32.c~45b257bec279826e:
  Delete: ndb/src/common/editline/editline_win32.c
BitKeeper/deleted/.del-sysunix.c~8e7a6901783efd17:
  Delete: ndb/src/common/editline/sysunix.c
BitKeeper/deleted/.del-unix.h~1c244c1d4ba6c6fb:
  Delete: ndb/src/common/editline/unix.h
BitKeeper/deleted/.del-Makefile~46cecfa6cd1a4e6b:
  Delete: ndb/src/common/editline/test/Makefile
BitKeeper/deleted/.del-testit.c~82837111b1876e44:
  Delete: ndb/src/common/editline/test/testit.c
BitKeeper/deleted/.del-Makefile_old~59409aa4debaeb90:
  Delete: ndb/src/common/Makefile_old
BitKeeper/deleted/.del-Makefile_old~92af3f5a7f24caf:
  Delete: ndb/src/mgmclient/Makefile_old
ndb/test/src/CpcClient.cpp:
  Rename: ndb/src/mgmclient/CpcClient.cpp -> ndb/test/src/CpcClient.cpp
ndb/test/include/CpcClient.hpp:
  Rename: ndb/src/mgmclient/CpcClient.hpp -> ndb/test/include/CpcClient.hpp
configure.in:
  removed editline
ndb/src/common/Makefile.am:
  removed editline
ndb/src/mgmclient/CommandInterpreter.cpp:
  removed editline and replaced with mysql readline
  created new facade object for CommandInterpreter
  removed CPC #if 0 code
ndb/src/mgmclient/Makefile.am:
  removed editline and replaced with mysql readline
  created new facade object for CommandInterpreter
  removed CPC #if 0 code
ndb/src/mgmclient/main.cpp:
  removed editline and replaced with mysql readline
  created new facade object for CommandInterpreter
  removed CPC #if 0 code
ndb/src/mgmclient/ndb_mgmclient.hpp:
  new facade object for CommandInterpreter
ndb/src/mgmsrv/CommandInterpreter.hpp:
  removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
ndb/src/mgmsrv/Makefile.am:
  removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
ndb/test/run-test/Makefile.am:
  moved cpc code to test
ndb/test/src/Makefile.am:
  moved cpc code to test
ndb/test/tools/Makefile.am:
  moved cpc code to test
2004-11-08 10:21:39 +00:00
unknown
3b38a854e0 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


mysql-test/r/ndb_autodiscover.result:
  testcase for table wo/ corresponding blob tables
mysql-test/r/ndb_autodiscover2.result:
  testcase for table wo/ corresponding blob tables
mysql-test/t/ndb_autodiscover.test:
  testcase for table wo/ corresponding blob tables
mysql-test/t/ndb_autodiscover2.test:
  testcase for table wo/ corresponding blob tables
ndb/include/ndbapi/NdbDictionary.hpp:
  Add non-const get column
ndb/src/ndbapi/NdbDictionary.cpp:
  Add non-const get column
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Allow "partially" getTable, which enables dropping of tables
     that fails to create blob tables
ndb/src/ndbapi/NdbScanOperation.cpp:
  Init counter when sending SCAN_TABREQ
sql/ha_ndbcluster.cc:
  Make sure that blob don't have to big part size
2004-11-08 11:06:36 +01:00
unknown
28986c7f92 wrong copyright 2004-11-07 09:42:27 +00:00
unknown
e5b02acd10 removed a bunch of "dead" files from the ndb src tree
BitKeeper/deleted/.del-Makefile_mysql~13fd89716a05b953:
  Delete: ndb/test/odbc/tpcb/Makefile_mysql
BitKeeper/deleted/.del-Makefile_ndb~6c74a0c6f8a79774:
  Delete: ndb/test/odbc/tpcb/Makefile_ndb
BitKeeper/deleted/.del-Makefile~c02da49a787c2f6e:
  Delete: ndb/test/odbc/tpcb/Makefile
BitKeeper/deleted/.del-readme.txt~3549c08b7818c64:
  Delete: ndb/test/odbc/tpcb/readme.txt
BitKeeper/deleted/.del-timesten.h~24e85d9b33938c67:
  Delete: ndb/test/odbc/tpcb/timesten.h
BitKeeper/deleted/.del-tpcb.cpp~7b670d738e1890ae:
  Delete: ndb/test/odbc/tpcb/tpcb.cpp
BitKeeper/deleted/.del-ttTime.c~94f84fefd7be03f3:
  Delete: ndb/test/odbc/tpcb/ttTime.c
BitKeeper/deleted/.del-ttTime.h~52ca967b5dfc48bc:
  Delete: ndb/test/odbc/tpcb/ttTime.h
BitKeeper/deleted/.del-list.h~1329477d9fb820be:
  Delete: ndb/src/external/LINUX.x86/sci/include/list.h
BitKeeper/deleted/.del-rmlib.h~1889009d4b47c498:
  Delete: ndb/src/external/LINUX.x86/sci/include/rmlib.h
BitKeeper/deleted/.del-sci_errno.h~a1da22da939f627:
  Delete: ndb/src/external/LINUX.x86/sci/include/sci_errno.h
BitKeeper/deleted/.del-sci_types.h~64136c0e5ac2ac5f:
  Delete: ndb/src/external/LINUX.x86/sci/include/sci_types.h
BitKeeper/deleted/.del-sisci_api.h~67839b64a1235d51:
  Delete: ndb/src/external/LINUX.x86/sci/include/sisci_api.h
BitKeeper/deleted/.del-sisci_demolib.h~ea5d3afd60121d20:
  Delete: ndb/src/external/LINUX.x86/sci/include/sisci_demolib.h
BitKeeper/deleted/.del-sisci_error.h~c6771e123aa79c71:
  Delete: ndb/src/external/LINUX.x86/sci/include/sisci_error.h
BitKeeper/deleted/.del-sisci_types.h~67a1a116970eb17f:
  Delete: ndb/src/external/LINUX.x86/sci/include/sisci_types.h
BitKeeper/deleted/.del-sisci_version.h~d542bfa4c7633fc:
  Delete: ndb/src/external/LINUX.x86/sci/include/sisci_version.h
BitKeeper/deleted/.del-version.h~b022e3a29d6d96ad:
  Delete: ndb/src/external/LINUX.x86/sci/include/version.h
BitKeeper/deleted/.del-inttypes.h~c9dfa7f6273df1b1:
  Delete: ndb/src/external/LINUX.x86/sci/include/os/inttypes.h
BitKeeper/deleted/.del-rmlib.h~61359201e51879bc:
  Delete: ndb/src/external/WIN32.x86/sci/include/rmlib.h
BitKeeper/deleted/.del-sisci_api.h~3b78e2453819b68d:
  Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_api.h
BitKeeper/deleted/.del-sisci_error.h~f48df70a324479a2:
  Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_error.h
BitKeeper/deleted/.del-sisci_types.h~f97cdce73b27052d:
  Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_types.h
BitKeeper/deleted/.del-sisci_version.h~fa5e2e6069bad028:
  Delete: ndb/src/external/SOLARIS.SPARC/sci/include/sisci_version.h
BitKeeper/deleted/.del-scilib.h~144397858368aafd:
  Delete: ndb/src/external/WIN32.x86/sci/include/scilib.h
BitKeeper/deleted/.del-sisci_api.h~23d9bf22685196be:
  Delete: ndb/src/external/WIN32.x86/sci/include/sisci_api.h
BitKeeper/deleted/.del-sisci_demolib.h~c149b88ed12e698e:
  Delete: ndb/src/external/WIN32.x86/sci/include/sisci_demolib.h
BitKeeper/deleted/.del-sisci_error.h~3118f4dbedb2eee0:
  Delete: ndb/src/external/WIN32.x86/sci/include/sisci_error.h
BitKeeper/deleted/.del-sisci_types.h~3cf6f68a4de25d19:
  Delete: ndb/src/external/WIN32.x86/sci/include/sisci_types.h
BitKeeper/deleted/.del-md5-rfc1321.txt~61f874f9cd434768:
  Delete: ndb/src/common/util/md5-rfc1321.txt
BitKeeper/deleted/.del-getarg.3~3d3256e9714fadf1:
  Delete: ndb/src/common/util/getarg.3
BitKeeper/deleted/.del-getarg.3.ps~bfb45b011e1164ae:
  Delete: ndb/src/common/util/getarg.3.ps
BitKeeper/deleted/.del-cvschk~c63d92daa21ed311:
  Delete: ndb/home/bin/cvschk
BitKeeper/deleted/.del-AssemblyInfo.cs~7632ee81b277625:
  Delete: ndb/src/cw/cpcc-win32/csharp/AssemblyInfo.cs
BitKeeper/deleted/.del-frmSplash.frm~40b5877abca91856:
  Delete: ndb/src/cw/cpcc-win32/vb6/frmSplash.frm
2004-11-05 23:59:06 +00:00
unknown
02af97cc34 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
unknown
76211d8689 updated start script for ndbcluster to make better cleanup
changed to use new switch


mysql-test/ndb/ndbcluster.sh:
  updated start script for ndbcluster to make better cleanup
ndb/test/run-test/main.cpp:
  changed to use new switch
2004-11-04 15:57:29 +00:00
unknown
9afd24f000 NDB bug #6426 fix
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  bug #6426 fix
2004-11-04 14:06:24 +01:00
unknown
eadb5ea564 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
unknown
6aeb346820 DbaccMain.cpp:
ugly fix for 'quadita2' ia64 icc -O1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ugly fix for 'quadita2' ia64 icc -O1
2004-11-04 12:14:19 +01:00
unknown
8db4292c9d 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
unknown
35ded49263 NDB blobs - try to handle insert-update-delete under autocommit=0
ndb/src/ndbapi/ndberror.c:
  826 error text
mysql-test/r/ndb_blob.result:
  result displayed error
mysql-test/t/ndb_blob.test:
  result displayed error
ndb/src/ndbapi/NdbBlob.cpp:
  update head+inline earlier
ndb/src/ndbapi/NdbOperationExec.cpp:
  blob IgnoreError bug
ndb/test/ndbapi/testBlobs.cpp:
  tried to set non-nullable to null, causing a complex abort case
ndb/src/ndbapi/NdbConnection.cpp:
  prepared ops CAN be left in complex abort
2004-11-03 20:21:56 +01:00
unknown
735be56379 changed to use the future-proof option to ndb_mgmd
there was a clash in using -c, added -f as the future proof switch


mysql-test/ndb/ndbcluster.sh:
  changed to use the future-proof option to ndb_mgmd
ndb/src/mgmsrv/main.cpp:
  there was a clash in using -c, added -f as the future proof switch
2004-11-03 14:34:21 +00:00
unknown
15f7e7ad89 Changed implementation in NdbDaemon slightly to handle
bug lockf & F_TEST on linux alpha,sparc,sparc64

(http://sources.redhat.com/ml/libc-alpha/2000-10/msg00390.html)
2004-11-03 11:29:19 +01:00
unknown
a87ff6cc4e Changed order or template specializations (to make aCC on hpita2 not assert)
ndb/src/common/util/basestring_vsnprintf.c:
  Removed redundant declaration
ndb/src/ndbapi/NdbDictionary.cpp:
  Add printout of distribution key property
2004-11-03 09:02:55 +01:00
unknown
60d1fbc9bb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-02 20:40:56 +01:00
unknown
bc0988c2d3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-02 19:40:54 +00:00
unknown
5c6cd1f796 add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
remove compiler warning
    patch for my_vsnprintf not dully implemented
    patch for platfroms that return -1 on snprintf overflow
    compile fix for hpux


configure.in:
  add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
ndb/src/common/editline/sysunix.c:
  remove compiler warning
ndb/src/common/util/basestring_vsnprintf.c:
  patch for my_vsnprintf not dully implemented
  patch for platfroms that return -1 on snprintf overflow
ndb/src/kernel/vm/Emulator.hpp:
  compile fix for hpux
ndb/src/mgmsrv/Services.cpp:
  compile fix for hp ux
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  remove compiler warning
2004-11-02 19:40:10 +00:00
unknown
6293a5787b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-02 15:37:53 +01:00
unknown
a6aaa907d1 Make sure that Int8(16,32,64) is signed
Better fix for previous build issue
2004-11-02 15:37:26 +01:00
unknown
03a91f9bb7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-02 14:25:30 +01:00
unknown
edca1f6a0c build issue
Fix so that signed/unsigned char does not matter in comparision


ndb/src/ndbapi/NdbOperationExec.cpp:
  Fix so that signed/unsigned char does not matter in comparision
2004-11-02 13:58:22 +01:00
unknown
d5121051f2 NDB fix blob parts distribution - backwards compatible
ndb/src/ndbapi/NdbBlob.cpp:
  fix blob parts distribution - backwards compatible
2004-11-02 13:15:55 +01:00
unknown
f8a875a238 removed unused member variable (probably causing some of the problems we've seen with ndb_mgmd) 2004-11-01 22:27:29 +00:00
unknown
727f7a85c8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 18:22:34 +00:00
unknown
bf30b006d3 fix for solaris forte -instances=static
added libNDBT.a
   removed printout
    fixed error that ndb_show_tables required table name


configure.in:
  fix for solaris forte -instances=static
ndb/test/run-test/Makefile.am:
  added libNDBT.a
ndb/tools/drop_tab.cpp:
  removed printout
ndb/tools/listTables.cpp:
  removed printout
  fixed error that ndb_show_tables required table name
ndb/tools/waiter.cpp:
  removed printout
2004-11-01 18:21:57 +00:00
unknown
04ff58d5e4 NDB blobs restore backwards compatibility
ndb/src/ndbapi/NdbBlob.cpp:
  restore backwards compatibility
2004-11-01 16:04:36 +01:00
unknown
62f23cadd8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-01 15:43:54 +01:00
unknown
740fc88e7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 14:25:40 +00:00
unknown
3302dee5c6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 13:56:15 +00:00
unknown
a2e4768f20 aligned ndb versioning with mysql
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
    added define NDB_INIT
    removed getarg, strlcat, strlcpy
    aligned ndb version with mysql version
    cpcd: removed old way of reading config file and replaced with mysql load_defaults
    changed from using getarg to my_getopts
    use mysql my_progname
    moved getarg to test


BitKeeper/deleted/.del-strlcat.c~250851f8f1ac1c2c:
  Delete: ndb/src/common/util/strlcat.c
BitKeeper/deleted/.del-strlcpy.c~43266e312d11c47b:
  Delete: ndb/src/common/util/strlcpy.c
ndb/test/include/getarg.h:
  Rename: ndb/include/util/getarg.h -> ndb/test/include/getarg.h
configure.in:
  aligned ndb versioning with mysql
  changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/include/ndb_global.h:
  added define NDB_INIT
  removed strlcpy, strlcat
ndb/src/common/editline/sysunix.c:
  removed usage of strlcat
ndb/src/common/util/Makefile.am:
  removed getarg, strlcat, strlcpy
ndb/src/common/util/basestring_vsnprintf.c:
  changed define from SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/src/common/util/socket_io.cpp:
  removed usage of strlcat
ndb/src/common/util/version.c:
  aligned ndb version with mysql version
ndb/src/cw/cpcd/common.cpp:
  removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/common.hpp:
  removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/main.cpp:
  changed from usin getarg to my_opts
ndb/src/kernel/blocks/backup/restore/main.cpp:
  changed from usin getarg to my_opts
ndb/src/kernel/error/ErrorReporter.cpp:
  use mysql my_progname
ndb/src/kernel/main.cpp:
  removed const in main declaration
ndb/src/kernel/vm/Configuration.cpp:
  changed from usin getarg to my_opts
ndb/src/kernel/vm/Configuration.hpp:
  removed const in main declaration
ndb/src/mgmclient/main.cpp:
  changed from usin getarg to my_opts
ndb/src/mgmsrv/main.cpp:
  changed from usin getarg to my_opts
ndb/src/ndbapi/Ndb.cpp:
  fixed compiler warnings
ndb/test/run-test/Makefile.am:
  moved getarg to test
ndb/test/src/Makefile.am:
  moved getarg to test
ndb/test/src/getarg.c:
  moved strlcat and strlcpy into getarg.c
ndb/tools/delete_all.cpp:
  changed from usin getarg to my_opts
ndb/tools/desc.cpp:
  changed from usin getarg to my_opts
ndb/tools/drop_index.cpp:
  changed from usin getarg to my_opts
ndb/tools/drop_tab.cpp:
  changed from usin getarg to my_opts
ndb/tools/listTables.cpp:
  changed from usin getarg to my_opts
ndb/tools/select_all.cpp:
  changed from usin getarg to my_opts
ndb/tools/select_count.cpp:
  changed from usin getarg to my_opts
ndb/tools/waiter.cpp:
  changed from usin getarg to my_opts
2004-11-01 13:55:43 +00:00
unknown
52487afa1f NDB blob fixes. INCOMPATIBLE with existing blobs
ndb/src/ndbapi/NdbBlob.cpp:
  misplaced code line + change blob tabledist
ndb/test/ndbapi/testBlobs.cpp:
  misplaced code line + change blob tabledist
2004-11-01 13:01:20 +01:00
unknown
3ba04dced3 Removed old not used/illegal declaration 2004-11-01 12:49:38 +01:00
unknown
77974c3ada Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-01 10:51:44 +01:00
unknown
f8f7110afe Fixed hanging ndb_mgmd on various platforms
Move init of node-init-mutex to before alloc node id


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Move init of node-init-mutex to before alloc node id
2004-11-01 10:38:27 +01:00
unknown
b1b3a8b9b0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41


ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
2004-10-31 15:44:35 +01:00
unknown
e4f0614cf4 NDB bug-6018 support writeTuple with blobs
mysql-test/r/ndb_blob.result:
  bug-6018
mysql-test/t/ndb_blob.test:
  bug-6018
ndb/include/ndbapi/NdbBlob.hpp:
  bug-6018
ndb/include/ndbapi/NdbConnection.hpp:
  bug-6018
ndb/include/ndbapi/NdbIndexOperation.hpp:
  bug-6018
ndb/include/ndbapi/NdbOperation.hpp:
  bug-6018
ndb/src/ndbapi/NdbBlob.cpp:
  bug-6018
ndb/src/ndbapi/NdbConnection.cpp:
  bug-6018
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  bug-6018
ndb/src/ndbapi/NdbIndexOperation.cpp:
  bug-6018
ndb/src/ndbapi/NdbOperation.cpp:
  bug-6018
ndb/src/ndbapi/NdbOperationExec.cpp:
  bug-6018
ndb/test/ndbapi/testBlobs.cpp:
  bug-6018
2004-10-31 15:33:56 +01:00