Commit graph

1781 commits

Author SHA1 Message Date
unknown
7b6ede6b03 recommit fix as 4.1->5.0 is currently impossible and fix is _really_ useful 2005-02-09 15:46:12 +01:00
unknown
9bb7c34885 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-09 15:36:57 +01:00
unknown
5c12bc88b9 use EXTRA_DIST instead of noinst_HEADERS 2005-02-09 15:20:38 +01:00
unknown
690479cd0c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-02-09 14:56:57 +01:00
unknown
8c3d70e208 ndb -
Fix bug in bug fix in FastScheduler
  remove possibility of endless loop
  resulting in APZJobBuffer overflow due to statistics reporting


ndb/src/kernel/vm/FastScheduler.cpp:
  Fix bug in bug fix in FastScheduler
    remove possibility of endless loop
    resulting in APZJobBuffer overflow due to statistics reporting
2005-02-09 14:24:25 +01:00
unknown
8207d5cefd Impl5 of WL2278 - dynamic port allocation for cluster nodes
Treat the management server specially.

It should always be the server in a transporter as we then have a known
port to connect to on node restart.

allows a mgm connection (i.e. to the management server port, our known port)
to be transformed into a transporter connection.

Also, clean up the struct TransporterConfiguration (used to be a struct for
each transporter type. now there's just one)


ndb/include/transporter/TransporterDefinitions.hpp:
  Clean up XXX_TransporterConfiguration and create one TransporterConfiguration structure.
  
  Makes things easier to read (especially in IPCConfig.cpp)
ndb/include/transporter/TransporterRegistry.hpp:
  add get_mgm_handle (to compliment the set_mgm_handle function)
  
  clean up createTransporter to use just one TransporterConfiguration struct
ndb/include/util/SocketClient.hpp:
  Introduce connect_without_auth() to ignore any authentication method that may have been set.
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Remove dead IPCConfig::configureTransporters(TransporterRegistry*)
  
  Fixup IPCConfig::configureTransporters(Uint32 nodeId...)
  - use the 'one struct TransporterConfiguration to rule them all'
  - make MGM node the server
  - fix switch statement for transporter types
    - close } in strange place
    - possible inadvertent fall through
ndb/src/common/transporter/OSE_Transporter.cpp:
  a partial fix for the introduction of new parameters.
  
  OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime.
ndb/src/common/transporter/OSE_Transporter.hpp:
  a partial fix for the introduction of new parameters.
  
  OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime.
ndb/src/common/transporter/SCI_Transporter.cpp:
  should be correct for SCI transporter.
ndb/src/common/transporter/SCI_Transporter.hpp:
  should be correct for SCI transporter
ndb/src/common/transporter/SHM_Transporter.cpp:
  add new parameters for Transporter constructor
ndb/src/common/transporter/SHM_Transporter.hpp:
  add new parameters for Transporter constructor
ndb/src/common/transporter/TCP_Transporter.cpp:
  add new parameters for Transporter constructor
ndb/src/common/transporter/TCP_Transporter.hpp:
  add new parameters for Transporter constructor
ndb/src/common/transporter/Transporter.cpp:
  Add new parameters
   - isMgmConnection
  	requires transforming from mgm to transporter
   - serverNodeId
  	node id that will serve as the server
  
  Treat connection differently if isMgmConnection (send a special mgm command first)
ndb/src/common/transporter/Transporter.hpp:
  add fields to constructor
  
  add isMgmConnection member (if true, have to transform a mgm connection)
ndb/src/common/transporter/TransporterRegistry.cpp:
  createTransporter -> createTCPTransporter (etc)
  
  add extra transporter constructor parameters (from config)
  
  modify to use changes to TransporterConfiguration
ndb/src/common/util/SocketClient.cpp:
  SocketClient::connect_without_auth()
  
  Temporarily disables authentication and connects.
  This is useful if you're trying to change what this
  SocketClient object is for (e.g. from mgm to ndb)
ndb/src/common/util/SocketServer.cpp:
  Don't runSession or close socket when entering sessionThread if m_stopped
ndb/src/mgmsrv/ConfigInfo.cpp:
  fixPortNumber
  - Get port number from the MGM node as it will always be the server
ndb/src/mgmsrv/MgmtSrvr.cpp:
  transporter_connect(sockfd)
  - transform this mgm connection into a transporter connection
ndb/src/mgmsrv/MgmtSrvr.hpp:
  prototype for transporter_connect
ndb/src/mgmsrv/Services.cpp:
  add command: "transporter connect"
  
  stops the MgmApiSession and replaces it with a transporter connection
ndb/src/mgmsrv/Services.hpp:
  prototype for transporter_connect
2005-02-10 00:11:21 +11:00
unknown
cf2835f6b1 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
2005-02-08 17:27:58 +01:00
unknown
a5d3c441ac Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-08 17:23:48 +01:00
unknown
f899de1d9d Makefile.am:
added noinst_HEADERS to get all things for the src dist


ndb/test/run-test/Makefile.am:
  added noinst_HEADERS to get all things for the src dist
2005-02-08 17:22:26 +01:00
unknown
b0cc9d7ad7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/orca/space/pekka/ndb/version/my50
2005-02-08 11:12:55 +01:00
unknown
7e0ac12bd3 ndb - workaround to strnxfrm 5.0 problem
ndb/src/common/util/NdbSqlUtil.cpp:
  strnxfrm bug, may not write the length it says
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  fix index in debug print
ndb/test/ndbapi/testOIBasic.cpp:
  do not generate too many mb chars, not checked in TUP
2005-02-08 10:33:58 +01:00
unknown
721d763496 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2005-02-06 10:47:42 +01:00
unknown
9f3e91e3ac Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-06 10:45:42 +01:00
unknown
6dc62ae2fe Merge
configure.in:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
2005-02-06 10:44:15 +01:00
unknown
2b2645d94c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
2005-02-06 10:41:59 +01:00
unknown
37b4b89ebe bug8262 - ndb
crash if scan is poped from queue before all attrinfo has arrived


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  only restart scan if all attrinfo has arrived
  otherwise just set remove from queue and set state
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  new error insert - force send attrinfo
ndb/test/ndbapi/testScan.cpp:
  new test bug8262 many threads - scanning small tables
ndb/test/run-test/daily-basic-tests.txt:
  run new test case in autotest
2005-02-06 10:00:29 +01:00
unknown
2a05021541 Merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-05 21:27:30 +01:00
unknown
13e47c5eb9 Fix for bug#8315 NdbScanFilter cmp method only works for strings of exact word boundry length 2005-02-05 15:47:06 +01:00
unknown
fe81b62c5f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-02-05 07:19:47 +01:00
unknown
df1dc7759b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2005-02-05 07:17:53 +01:00
unknown
4d1441dac4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
2005-02-05 07:16:07 +01:00
unknown
24250e33be resolved merge conflict
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-04 14:27:09 +01:00
unknown
48e2d22404 added test to trigger drifferent fragmentations in ndb
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows


mysql-test/r/ndb_basic.result:
  added test to trigger drifferent fragmentations in ndb
mysql-test/t/ndb_basic.test:
  added test to trigger drifferent fragmentations in ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  corrected documentation on fragmentation
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  set "fragmentation medium" to mean 2 fragments per node instead of 1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  set default fragmentation to small instead of medium
sql/ha_ndbcluster.cc:
  bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
unknown
dbf8329576 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/item_func.cc:
  Auto merged
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
2005-02-04 10:35:09 +01:00
unknown
5fcb5891b6 Merge
ndb/src/mgmclient/CommandInterpreter.cpp:
  SCCS merged
2005-02-04 06:13:27 +01:00
unknown
3a7f82ef3c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-04 06:10:56 +01:00
unknown
ef5c8dbf7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-04 06:09:43 +01:00
unknown
9f7c9aa7d5 ndb - sol9x86: cc -xO3: fix optimizer error.
ndb/src/common/util/NdbSqlUtil.cpp:
  sol9x86: cc -xO3: fix optimizer error.
  Note: same expression remains in Field_newdate::val_int().
2005-02-03 23:56:13 +01:00
unknown
81abb11ad4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2005-02-03 18:22:06 +01:00
unknown
a0687bb5a4 Merge mysql.com:/Users/mikron/mysql-4.1
into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
2005-02-03 18:19:39 +01:00
unknown
377d419f4a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-03 17:17:06 +01:00
unknown
024b25cea3 ndb - hugo
more removal of pNdb->closeTransaction


ndb/test/src/HugoTransactions.cpp:
  more removal of pNdb->closeTransaction
2005-02-03 17:16:00 +01:00
unknown
a6cb0e5ff1 ndb - use hugo methods all the way in hugo
more test program fixes
  replace pNdb->closeTransaction with closeTransaction(pNdb)


ndb/test/src/HugoTransactions.cpp:
  more test program fixes
    replace pNdb->closeTransaction with closeTransaction(pNdb)
2005-02-03 17:10:46 +01:00
unknown
d595ac8df8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-03 17:05:55 +01:00
unknown
e7c3dc943c merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
2005-02-03 17:04:27 +01:00
unknown
a5463c252a corrected automerge error
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
ndb/test/ndbapi/flexBench.cpp:
  Auto merged
ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
ndb/test/ndbapi/flexTT.cpp:
  Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  corrected automerge error
2005-02-03 17:00:51 +01:00
unknown
2253df9b60 bug#8281
NdbScanFilter, not a bug. But update example program


ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp:
  memset char[20] as all bytes are significant when comparing
2005-02-03 15:09:43 +01:00
unknown
4f1cbb6031 4.1 -> 5.0 merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
mysql-test/r/derived.result:
  Auto merged
mysql-test/r/func_str.result:
  Simple merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/derived.test:
  Automatic merge
mysql-test/t/func_str.test:
  Simple merge
mysql-test/t/subselect.test:
  Automatic merge
mysys/my_handler.c:
  Automatic merge
ndb/src/kernel/blocks/backup/Backup.cpp:
  Automatic merge
scripts/make_binary_distribution.sh:
  Automatic merge
scripts/mysql_install_db.sh:
  Automatic merge
sql/examples/ha_archive.cc:
  Simple merge
sql/ha_innodb.cc:
  Automatic merge
sql/item.cc:
  Merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_func.cc:
  Simple merge
sql/item_func.h:
  Automatic merge
sql/item_strfunc.cc:
  Automatic merge
sql/item_strfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Automatic merge
sql/mysqld.cc:
  Automatic merge
sql/set_var.cc:
  Automatic merge
sql/sql_base.cc:
  Automatic merge
sql/sql_class.cc:
  Automatic merge
sql/sql_class.h:
  Automatic merge
sql/sql_lex.cc:
  Automatic merge
sql/sql_lex.h:
  Automatic merge
sql/sql_parse.cc:
  Automatic merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Automatic merge
sql/sql_update.cc:
  Simple merge
strings/ctype-big5.c:
  Automatic merge
strings/ctype-bin.c:
  Automatic merge
strings/ctype-gbk.c:
  Automatic merge
strings/ctype-latin1.c:
  Automatic merge
strings/ctype-mb.c:
  Automatic merge
strings/ctype-simple.c:
  Automatic merge
strings/ctype-sjis.c:
  Automatic merge
strings/ctype-tis620.c:
  Automatic merge
strings/ctype-ucs2.c:
  Automatic merge
strings/ctype-utf8.c:
  Automatic merge
vio/viosocket.c:
  Automatic merge
vio/viossl.c:
  Automatic merge
2005-02-03 13:18:30 +02:00
unknown
ed26328745 ndb -
Remove extra NdbCond_signal when receiving TRANSID_AI
  and not being complete with operation


ndb/src/ndbapi/Ndbif.cpp:
  Remove extra NdbCond_signal when receiving TRANSID_AI
    and not being complete with operation
2005-02-03 11:41:36 +01:00
unknown
1bbfa6f75f ndb -
add abort to multi op test case


ndb/include/ndbapi/NdbConnection.hpp:
  Add aborts to test case
ndb/test/include/HugoOperations.hpp:
  Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
  Add aborts to test case
2005-02-02 21:03:46 +01:00
unknown
4734f3f746 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
unknown
e7ff746989 backported configure flag from 5.0
workaround for HPUX signal.h error, missing extern "C" 
    moved my_thread_end to NdbThreadExit
   more checks for shared memory transporter signum setup


acinclude.m4:
  backported configure flag from 5.0
include/my_global.h:
  workaround for HPUX signal.h error, missing extern "C"
ndb/src/common/portlib/NdbThread.c:
  moved my_thread_end to NdbThreadExit
ndb/src/mgmsrv/ConfigInfo.cpp:
  more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
unknown
d54b72c9fc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 06:32:11 +01:00
unknown
1a2ef2be00 ndb - backup fix, found on powermacg4
ndb/src/kernel/blocks/backup/Backup.cpp:
  index typo overwrote attribute array, found on powermacg4
2005-02-02 03:58:43 +01:00
unknown
cf660b001e cleanup and streamlining of thread create/exit in ndb 2005-02-01 19:01:37 +01:00
unknown
6b7f067e8b merge 2005-02-01 17:16:05 +01:00
unknown
64412075e8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/mysqld.cc:
  Auto merged
2005-02-01 17:11:09 +01:00
unknown
3a890c8a87 ndb -
1) New testcase
   Check every combination of ins/upd/del of length 5
   Check reading savepoint's
2) Fix 1 liner in acc wrt committing read


ndb/include/ndbapi/NdbConnection.hpp:
  Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
  Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
  New testcase
    Check every combination of ins/upd/del of length 5
    Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
  Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
  Make copy of testcase name
2005-02-01 16:49:23 +01:00
unknown
098fc22417 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5


ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/cw/cpcd/main.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-02-01 11:45:05 +11:00
unknown
8b08a2e87f Merge
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
strings/ctype-simple.c:
  SCCS merged
2005-01-31 16:27:17 -08:00