Commit graph

1765 commits

Author SHA1 Message Date
unknown
c4590730a6 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-16 09:58:34 +01:00
unknown
caadae10e1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
2005-02-16 11:28:23 +11:00
unknown
77212351c6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-15 14:31:52 +01:00
unknown
c0a3bf06e0 added info to dump state 8004
added debug printouts
    changed mem allocation handling in event api
   split single and parallell event operation testing


ndb/src/kernel/blocks/suma/Suma.cpp:
  added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
  split single and parallell event operation testing
2005-02-15 14:18:17 +01:00
unknown
16e60651bf 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


sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-15 12:06:29 +01:00
unknown
e537c5e147 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
2005-02-15 11:38:00 +01:00
unknown
a975cbfdd9 fixes in connect_client thread. g_eventLogger usage, correct condition on calling connect on Transporter
ndb/src/common/transporter/TransporterRegistry.cpp:
  Only check that we have a port number before attempting a transporter connect
2005-02-15 19:15:31 +11:00
unknown
0cc89c6b5f In connect_clients thread:
- don't wait an extra 400ms before retrying a transporter connect if the port is dynamic


ndb/src/common/transporter/TransporterRegistry.cpp:
  Don't wait extra time before retrying
2005-02-15 18:47:31 +11:00
unknown
2188ae0d07 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-15 08:39:11 +01:00
unknown
9deea70292 Don't ask mgm server for port to connect transporter to if we already have one; only ask if connect fails.
Reconnect to mgm server in connect_clients thread if m_mgm_handle is disconnected.


ndb/include/mgmapi/mgmapi.h:
  Add prototype for ndb_mgm_is_connected
ndb/src/common/transporter/TransporterRegistry.cpp:
  start_clients_thread:
  - don't get port if we don't have to
  - Reconnect to mgm server if m_mgm_handle is disconnected
ndb/src/mgmapi/mgmapi.cpp:
  add ndb_mgm_is_connected
2005-02-15 18:30:44 +11:00
unknown
2ad1624371 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 16:22:00 +01:00
unknown
88bab66ffa 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-14 15:54:37 +01:00
unknown
114487dd08 make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
Make sure that the node itself is set in the m_connected_nodes when connected


ndb/src/kernel/vm/Configuration.cpp:
  make sure we destroy the iterator before reusing the variable
ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
ndb/src/ndbapi/ClusterMgr.cpp:
  Make sure that the node itself is set in the m_connected_nodes when connected
2005-02-14 15:51:44 +01:00
unknown
513655cede 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-14 13:00:52 +01:00
unknown
c24523c87f corrected error in checking get() return value from config iterator 2005-02-14 11:29:46 +01:00
unknown
0fbd1d8f95 mgmapi to return connected port and interface _only_ if it is actually connected
use m_cofigMutex when configuration is accessed
   use c++ iteration interface everywhere in MgmtSrvr code
    use NDB_INVALID_SOCKET everywhere in Services.cpp


ndb/src/common/transporter/TransporterRegistry.cpp:
  removed warning
ndb/src/mgmapi/mgmapi.cpp:
  mgmapi to return connected port and interface _only_ if it is actually connected
ndb/src/mgmsrv/MgmtSrvr.cpp:
  use m_cofigMutex when configuration is accessed
  use c++ iteration interface everywhere
ndb/src/mgmsrv/Services.cpp:
  use NDB_INVALID_SOCKET everywhere
2005-02-14 11:15:00 +01:00
unknown
efdfda4616 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


sql/handler.h:
  Auto merged
2005-02-14 09:22:14 +01:00
unknown
6d2a507343 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 09:05:55 +01:00
unknown
a0f6d69b91 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2005-02-14 19:05:54 +11:00
unknown
96227c27cc connect_ndb_mgmd stilled some more mem leaks 2005-02-14 09:05:53 +01:00
unknown
8ca755591c fixed memory-leak in case of connect failure 2005-02-14 08:50:16 +01:00
unknown
1a7d87e33d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 08:30:52 +01:00
unknown
3794371069 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-14 08:29:43 +01:00
unknown
9f2240b479 wl1292 - ndb autotest
fix log reports


ndb/test/run-test/make-html-reports.sh:
  fix log reports
2005-02-14 08:28:47 +01:00
unknown
0e25e70971 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/transporter/TransporterRegistry.cpp:
  Auto merged
2005-02-14 18:19:11 +11:00
unknown
1df41ff584 Transporter holds a signed port number so the check for a dynamic port in
connect_client thread will work more than just first-time.


ndb/src/common/transporter/Transporter.cpp:
  m_r_port is now m_s_port a SIGNED port. <0 is dynamic
ndb/src/common/transporter/Transporter.hpp:
  m_r_port is now m_s_port, a SIGNED port number (<0 is dynamic).
  
  We give the socket client a positive port though.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Transporter now holds SIGNED port number (<0 dynamic)
2005-02-14 18:09:06 +11:00
unknown
f315e00e56 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-12 15:20:55 +01:00
unknown
e03b7bd879 wl1292 - ndb autotest
Fix 4.1 memleak in Hugo


ndb/test/include/HugoOperations.hpp:
  Fix mem leak in Hugo
ndb/test/src/HugoTransactions.cpp:
  Fix mem leak in Hugo
2005-02-12 15:12:53 +01:00
unknown
66d5e4e888 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-12 15:06:39 +01:00
unknown
3ca04269c9 wl1292 - ndb autotest
link to log if it exists, regardless of test result


ndb/test/run-test/make-html-reports.sh:
  link to log if it exists, regardless of test result
2005-02-12 15:05:33 +01:00
unknown
810d558f97 Merge
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-11 22:30:37 +01:00
unknown
9387349ed2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 08:17:18 +01:00
unknown
28d3f08317 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 08:13:25 +01:00
unknown
7b5ef7cc0d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-11 08:10:46 +01:00
unknown
4f53f70f72 ndb - fix compiler warning (error using gcc-3.4.3)
ndb/test/ndbapi/bench/mainPopulate.cpp:
  compiler warning (error using gcc-3.4.3)
2005-02-11 08:09:47 +01:00
unknown
9a2b2033ce Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
2005-02-11 17:29:01 +11:00
unknown
85ee8a1847 return NDB_INVALID_SOCKET instead of -1 for Windows compatibility.
(Found in review by Tomas Ulin)
2005-02-11 17:23:06 +11:00
unknown
dd5767356b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
unknown
0a0b9309eb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-11 06:42:57 +01:00
unknown
38e71e3ab8 ndb - old bench rescue
ndb/test/ndbapi/bench/mainPopulate.cpp:
  return correct
ndb/test/ndbapi/bench/userInterface.cpp:
  remove NA setting
ndb/test/run-test/daily-devel-tests.txt:
  set correct args
2005-02-11 06:39:00 +01:00
unknown
6bd9c85acd WL2278 Dynamic ports - Impl 6, "deal with mgm server restart and multiple mgm servers"
- when connecting to a mgm server as a transporter, create a NdbMgmHandle
  - over this mgm handle, report the dynamic ports
  - then turn it into a transporter
- this will re-report dynamic ports to mgmds when they restart (as we'll have to
set up our transporter again). This will also report it to all mgmds (as we'll
have transporters to all of them).


ndb/include/mgmapi/mgmapi.h:
  Add ndb_mgm_convert_to_transporter
   - converts to a transporter connect
   - destroys the handle (without disconnecting)
   - returns socket
ndb/include/transporter/TransporterRegistry.hpp:
  Add prototype for connect_ndb_mgmd
ndb/include/util/SocketClient.hpp:
  Remove connect_without_auth
  
  Add get_port() and get_server_name()
ndb/src/common/transporter/Transporter.cpp:
  use TransporterRegistry::connect_ndb_mgmd() to make the connection if isMgmConnection
ndb/src/common/transporter/TransporterRegistry.cpp:
  Impliment TransporterRegistry::connect_ndb_mgmd
  
  - takes a SocketClient and constructs a connectstring.
  - uses this connect string to make a NdbMgmHandle
  - send dynamic ports to this mgm server
  - transform into a transporter connect
  - return socket
ndb/src/common/util/SocketClient.cpp:
  Remove connect_without_auth
ndb/src/kernel/main.cpp:
  Don't relay dynamic ports. We now do this on transporter connect
ndb/src/mgmapi/mgmapi.cpp:
  Impliment ndb_mgm_convert_to_transporter
  - converts the mgm connection into a transporter connection
  - destroys the handle
  - returns the socket that should now be used as a transporter
2005-02-11 15:43:43 +11:00
unknown
6eae64dd2c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 18:38:14 +01:00
unknown
2acf4014b3 added more debug trace
+ removed double check for invalid socket


ndb/src/common/transporter/Transporter.cpp:
  added more debug trace
  + removed double check for invalid socket
ndb/src/ndbapi/Ndb.cpp:
  added more debug trace
2005-02-10 18:38:13 +01:00
unknown
4eb1c6840b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2005-02-10 18:16:53 +01:00
unknown
527c2d7447 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-02-10 18:16:09 +01:00
unknown
d4574b91af ndb - add more tests to autotest
ndb/test/run-test/daily-basic-tests.txt:
  run mysql-test-run for max 1 hour
    (normally 30 minutes)
ndb/test/run-test/daily-devel-tests.txt:
  Add benchmark to devel suite
ndb/test/run-test/main.cpp:
  Add bench mode. always produce report
ndb/test/run-test/run-test.hpp:
  Add bench mode. always produce report
2005-02-10 18:15:15 +01:00
unknown
d8c74a9cd2 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
2005-02-10 17:12:53 +01:00
unknown
ed74e8f9a6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 17:11:45 +01:00
unknown
86b0dc16d9 ndb - adapt old testprg to changes in ndbapi
ndb/test/ndbapi/bench/userInterface.h:
  adapt to changes in ndbapi
2005-02-10 17:07:14 +01:00
unknown
fc75a8367d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-02-10 16:19:44 +01:00