Commit graph

18582 commits

Author SHA1 Message Date
unknown
4f5de2f393 Fix call to set_connect_string 2005-01-14 16:07:10 +11:00
unknown
f2e98ab5af Distinguish between "real" ports and those that can be negative (dynamic).
(Suggested by Tomas Ulin as part of review for WL2278)


ndb/include/transporter/TransporterRegistry.hpp:
  Differentiate signed port numbers from unsigned ones
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Explain the sign of server_port
ndb/src/common/transporter/TransporterRegistry.cpp:
  Use s_port to indicate a signed port number.
ndb/src/kernel/main.cpp:
  use m_s_service_port to indicate signed port number
ndb/src/mgmsrv/MgmtSrvr.cpp:
  differentiate between signed and unsigned port numbers
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  use m_s_service_port to indicate signed port number
2005-01-14 15:42:11 +11:00
unknown
48f05d2fce Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-01-12 18:41:00 +11:00
unknown
5615ff29bb Impl4 of WL2278 - Dynamic port allocation of cluster nodes
When a node restarts it starts over again with fetching the configuration
-  It is not sure that it can use the "old dynamically allocated port number" again.
-  It should however try to reuse the old one, if not possible it should
allocate a new one. One has to be able to distinguish between portnumbers
specified originally in the config, and ones that has been dynamically added
(the latter may be changed if "busy", but the first cannot be changed).

We use negative portnumbers for ports that are ok to change.


ndb/include/mgmapi/mgmapi_debug.h:
  change prototype for:
  ndb_mgm_set_connection_int_parameter
  ndb_mgm_get_connection_int_parameter
  
  Accept/set an int instead of an unsigned
ndb/include/transporter/TransporterRegistry.hpp:
  Use an int (signed) to represent a port number.
  
  Zero means dynamic (but unassigned)
  >0 means static (defined in configuration)
  <0 means dynamic (and should be converted to positive before use)
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Set up the Transporter with a port number of the correct sign.
ndb/src/common/transporter/TransporterRegistry.cpp:
  start_clients_thread:
   - handle negative port numbers
  
  add_transporter_interface:
   - accept signed integer as port number
  
  start_service:
   - If port is dynamic (<0), try to bind to it.
  	if that fails (e.g. some other process has taken that port),
  	then get a new dynamic port number.
ndb/src/mgmapi/mgmapi.cpp:
  Use a signed integer for value in:
  ndb_mgm_set_connection_int_parameter
  ndb_mgm_get_connection_int_parameter
  
  Cast to a Uint32 for storage/retrieval to/from Properties
ndb/src/mgmsrv/MgmtSrvr.cpp:
  getConnectionDbParameter
   - return value as integer (signed)
   - cast as Uint32 for iter.get
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Update prototype of getConnectionDbParameter
  
  int value (not unsigned anymore)
ndb/src/mgmsrv/Services.cpp:
  MgmApiSession::getConnectionParameter
   - value is now signed
2005-01-12 18:13:54 +11:00
unknown
61eec3db43 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-12 11:25:49 +11:00
unknown
a964b18269 change to using public enum for log events
ndb/include/Makefile.am:
  added ndb_logevent to source dist
2005-01-11 23:25:45 +01:00
unknown
0f44ad64d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-11 23:02:14 +01:00
unknown
9318c3d453 Documentation: NdbError is no longer a class,
it's a struct now.


ndb/include/ndbapi/Ndb.hpp:
  NdbError is no longer a class, it's a struct now.
2005-01-12 03:55:53 +10:00
unknown
533bd8fc3f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-11 18:36:35 +01:00
unknown
ccbe896a24 removed getBaseTable, was wrong and will not work 2005-01-11 18:32:02 +01:00
unknown
58034683dc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-01-11 17:20:14 +01:00
unknown
6dbadfa12e merge 2005-01-11 17:02:30 +01:00
unknown
577b8e4e28 removed compiler warnings from ha_ndbcluster
sql/ha_ndbcluster.cc:
  removed compiler warnings
2005-01-11 17:00:31 +01:00
unknown
febd527e03 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 16:49:52 +01:00
unknown
95fa0d99e1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 14:21:58 +01:00
unknown
4ebb09797b Removed compiler warnings 2005-01-11 14:06:44 +01:00
unknown
d067695909 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 13:56:06 +01:00
unknown
f2e368483d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 13:50:28 +01:00
unknown
7bdd452ddb If VARCHAR strips only trailing spaces, then produce
a note, not a warning or error.
2005-01-11 16:49:45 +04:00
unknown
89866c5430 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 13:36:27 +01:00
unknown
e7b38aa7bd Fixes for two compile-time failures.
ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure
2005-01-11 15:32:23 +03:00
unknown
d73a4de9b7 bug#7798 - ndb - range scan with invalid table version could cause node failure
mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version
2005-01-11 13:30:11 +01:00
unknown
7bf677dd64 Merge mysql.com:/home/kostja/work/mysql-4.1-7428
into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 14:47:12 +03:00
unknown
194937169f Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00
unknown
4801c2e62f A fix for linking failure of MySQL client when linking with imap libraries
(Bug#7428) (renamed: hash_reset -> my_hash_reset)


mysys/hash.c:
  renamed: hash_reset -> my_hash_reset
sql/sql_class.h:
  hash_reset -> my_hash_reset
2005-01-11 13:53:10 +03:00
unknown
a28ebe6b6f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 11:16:02 +01:00
unknown
28f86d8ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:14:14 +01:00
unknown
fe8c6a4a03 make it compile with -ansi -pedantic 2005-01-11 13:12:52 +03:00
unknown
9cc4ada8d4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:12:46 +01:00
unknown
eae30642cd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 10:34:37 +01:00
unknown
1ef48556bd Bug#7477 2005-01-11 10:34:36 +01:00
unknown
9acc2bbd2d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 10:31:31 +01:00
unknown
7535b07425 bug#7765 - ndb startup on 64-bit, increase stack on 64-bit
ndb/src/common/portlib/NdbThread.c:
  Use double stack for 64-bit
2005-01-11 10:02:31 +01:00
unknown
c92554e81f Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-11 05:11:42 +01:00
unknown
7b66387475 Merge
BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-11 05:10:08 +01:00
unknown
d2e6def187 Report an error if connect_client fails.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Report an error if connect_client fails. This should never really happen,
  except if strange things are going on. Hit this case during development,
  probably good to report if it happens.
2005-01-11 13:33:00 +11:00
unknown
3c41c5fb1c Merge mysql.com:/home/jwinstead2/mysql-4.1-7556
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 02:57:47 +01:00
unknown
7451f0b38c Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
unknown
4bd2b5adc4 Fix style nit
sql/examples/ha_archive.cc:
  Fix style
2005-01-11 01:01:35 +01:00
unknown
57ff6dd01a field.h, field.cc:
Did some more split TABLE to TABLE and TABLE_SHARE


sql/field.cc:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
sql/field.h:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
2005-01-11 00:17:21 +01:00
unknown
4bb238a054 Fix double-initalization of mutex in archive storage engine. (Bug #7762)
sql/examples/ha_archive.cc:
  Fix redundant initialization of share->mutex
  Fix error handling to always clean up correctly
  Fix a couple of warnings
2005-01-10 23:59:28 +01:00
unknown
b63d9439c9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-10 23:27:37 +01:00
unknown
26c1d47a0d Recorded new result file 2005-01-10 21:45:35 +01:00
unknown
f360ee773c Fix for failing INSERT IGNORE 2005-01-10 20:55:05 +01:00
unknown
d3f5dfbd17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 18:46:31 +01:00
unknown
a4eb7490b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 18:42:07 +01:00
unknown
7d8451266a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/mysql-5.0
2005-01-10 16:27:16 +00:00
unknown
c0d168e65d Initialize lex->mqh structure. Fixes valgrind warnings. 2005-01-10 16:24:05 +00:00
unknown
4399f8931a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
2005-01-10 16:32:03 +01:00
unknown
cc1c4a99ef - removed the mysql-test/suites/jp test suite and marked all files as gone 2005-01-10 16:19:01 +01:00