Commit graph

18768 commits

Author SHA1 Message Date
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
fbff8b8e65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 02:36:50 +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
507dbe230b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-10 14:12:49 -06: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
unknown
0f49bc7f7e Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-01-10 09:18:31 -06:00
unknown
345e51802d bad merge fixed 2005-01-10 16:03:06 +01:00
unknown
044172b0fa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
2005-01-10 16:02:37 +01:00
unknown
7767a687f9 added new methods for NdbTransaction::getNdbIndexOperation() and NdbTransaction::getNdbIndexScanOperation() as recommended
made others depricated
updated examples to use recommended
2005-01-10 16:02:36 +01:00
unknown
24b048f5f4 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/net_serv.cc:
  Auto merged
2005-01-10 15:15:49 +01:00
unknown
87e1a296ab A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE). 2005-01-10 15:13:33 +01:00
unknown
f755e4aece wl2240 - ndb partitioning
1) Fix startTransaction with hint
2) Ship fragment data to API to make better guess
3) Expose both primary & backup replicas 
   To (in the future) be even more clever on choosing nodes for
   transactions/operations


ndb/include/kernel/ndb_limits.h:
  Set maxsize of array with fragment data
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Send fragment data to API
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Use Uint16 for fragment info
  Fix uninit variable
ndb/src/ndbapi/Ndb.cpp:
  Impl. startTransaction with hint
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  remove Fragment2NodeMap and put it on table instead
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  remove Fragment2NodeMap and put it on table instead
ndb/test/ndbapi/testNdbApi.cpp:
  Test some more
2005-01-10 14:40:54 +01:00
unknown
2d3c55cd7b os0file.c:
Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined


innobase/os/os0file.c:
  Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined
2005-01-10 15:26:33 +02:00
unknown
7a35921bff Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


Build-tools/Bootstrap:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-10 14:13:41 +01:00
unknown
d8d9f79e09 Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.


sql/net_serv.cc:
  If no VIO, no write.
2005-01-10 13:52:32 +01:00
unknown
96ae27c7c2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-10 12:30:28 +01:00
unknown
4630282b51 updated docs on hints 2005-01-10 12:04:08 +01:00
unknown
7421239787 fixed testNdbApi to use new startTransaction interface 2005-01-10 11:54:03 +01:00
unknown
0b7895b9b1 merge 2005-01-10 11:49:58 +01:00
unknown
994fb392c1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-10 11:33:27 +01:00
unknown
22aa44a651 changed Ndb::startTransaction() interface or partition key/hint 2005-01-10 11:33:26 +01:00
unknown
815f62223a bug#7761 - ndb does not autcommit - postreview fixes
sql/sql_table.cc:
  Move ha_enable to before new Copy, to ensure no memory is leaked
2005-01-10 11:33:08 +01:00
unknown
b4871e2973 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-10 11:20:01 +01:00
unknown
1409b9d7ae bug#7761 - ndb does not autocommit during alter table
sql/sql_table.cc:
  Turn off transactions before locking (as locking will need to know)
2005-01-10 11:17:01 +01:00
unknown
99f07f83ac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-10 01:35:18 +01:00
unknown
33465a14d1 fixed a number of doxygen warnings 2005-01-10 01:25:20 +01:00
unknown
c7341b2e92 Incorporate Jonas Orland's suggestions.
ndb/src/common/util/SocketServer.cpp:
  Check for errors from getsockname (and error display).
  
  use SOCKET_SIZE_TYPE (as discovered by configure) instead of socklen_t
2005-01-10 10:57:43 +11:00
unknown
69da579aeb Finish WL2278 Impl 3 - Dynamic port allocation of cluster nodes.
ndb/include/util/SocketClient.hpp:
  Add SocketClient::set_port(unsigned short port)
  - Sets both m_port and m_servaddr.sin_port
ndb/src/common/transporter/Transporter.hpp:
  Fix set_r_port to call m_socket_client->set_port(port) (if there's a socket client).
ndb/src/common/transporter/TransporterRegistry.cpp:
  Handle non-TCP Transporter nodes correctly
ndb/src/mgmsrv/main.cpp:
  Better document and error check connecting back to our own ndb_mgmd
2005-01-10 10:19:15 +11:00
unknown
4327c18b93 Merge
ndb/include/mgmapi/mgmapi.h:
  SCCS merged
2005-01-09 23:19:07 +01:00
unknown
d2ab825684 CommandInterpreter.cpp:
adopted to changes in mgmapi


ndb/src/mgmclient/CommandInterpreter.cpp:
  adopted to changes in mgmapi
2005-01-09 23:03:33 +01:00
unknown
9ec0095e47 updated ndb_mgm test
removed grep event and added congestion event
   more docs
    changed some naming, expecially regarding severities
    added config param for logevel for congestion


mysql-test/ndb/basic.result:
  updated ndb_mgm test
mysql-test/ndb/restart.test:
  updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
  removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
  more docs
  changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
  removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
  changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
  added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
  just som variable name changes
2005-01-09 23:02:06 +01:00
unknown
8fa10a2967 Documentation edits/fixes/cleanup for Alcatel docs.
ndb/include/mgmapi/mgmapi.h:
  Documentation edits and fixes.
ndb/include/ndbapi/Ndb.hpp:
  Misc. documentation cleanup.
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Documentation edits and fixes.
2005-01-10 02:39:36 +10:00
unknown
3c7b8815c3 added example of mgmapi usage
moved get_configuration to doxygen internal since the "iterators" are not documented
2005-01-09 14:31:54 +01:00
unknown
882490f218 ndb - change "ndb_mgmd --interactive" to use mgmclient interpreter
BitKeeper/deleted/.del-CommandInterpreter.cpp~fb62c05516034e7c:
  Delete: ndb/src/mgmsrv/CommandInterpreter.cpp
BitKeeper/deleted/.del-CommandInterpreter.hpp~8d8bc7e937d7b60e:
  Delete: ndb/src/mgmsrv/CommandInterpreter.hpp
ndb/src/Makefile.am:
  Change order between subdirs to build mgmclient before mgmsrv
    to enable --interactive in mgmsrv
ndb/src/mgmsrv/Makefile.am:
  Add --interactive by linking mgmclient
ndb/src/mgmsrv/main.cpp:
  Add --interactive by linking mgmclient
2005-01-09 13:53:54 +01:00