Commit graph

18700 commits

Author SHA1 Message Date
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
88e845067b 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/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-10 09:31:17 +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
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
6cfef07c05 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/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-09 15:41:54 +01: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
unknown
cfe5650cab Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-09 11:01:47 +01:00
unknown
9b80f95f8f ndb -
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets


mysql-test/r/ndb_charset.result:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix ndb_limit, handle cmpDate of length 3
2005-01-09 11:00:37 +01:00
unknown
b4de620e51 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-09 10:58:37 +01:00
unknown
0290aad316 added some doxygen docs
removed unused error codes
2005-01-09 10:47:47 +01:00
unknown
0ac86b5c52 Ndb.hpp: Documentation edits to Cluster Concepts
and Ndb class description;
Doxyfiles: moved detailed class/member descriptions 
to top of generated files.


ndb/docs/doxygen/Doxyfile.ndbapi:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.ndb:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.odbc:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.test:
  Moved detailed class descriptions to top of output.
ndb/include/ndbapi/Ndb.hpp:
  Documentation edits to Cluster Concepts, 
  Ndb Class Description
2005-01-09 18:17:29 +10:00
unknown
579238abb3 More documentation edits in Ndb.hpp (Adaptive Send Algorithm)
ndb/include/ndbapi/Ndb.hpp:
  More documentation edits (Adaptive Send).
2005-01-09 14:55:06 +10:00
unknown
79192c2335 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-09 05:03:33 +01:00
unknown
e7b9581f36 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


sql/set_var.cc:
  Auto merged
2005-01-08 19:46:52 -06:00
unknown
f8f7888b5c set_var.cc:
Whack duplicate variable line. (Affects SHOW VARIABLES.)


sql/set_var.cc:
  Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
unknown
c6f3edbe88 sql_select.cc:
silence picky compiler warning.


sql/sql_select.cc:
  silence picky compiler warning.
2005-01-08 19:40:58 -06:00
unknown
fdadfe515f Replace all sprintf() calls with my_snprintf() in client.c. All of the
format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556)


sql-common/client.c:
  Replace all sprintf() calls with my_snprintf()
2005-01-09 02:19:42 +01:00
unknown
7177746d49 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged
2005-01-08 18:42:48 -06:00
unknown
e528890462 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-08 18:32:57 -06:00
unknown
91a3e90baf ndb - wl-1442 merge fix 5.0 -> 5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb
2005-01-09 01:14:11 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
3fbb1dd5ff updated some mgmapi docs 2005-01-09 00:45:05 +01:00
unknown
09ee2d3db0 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-08 23:32:53 +01:00
unknown
e9befed644 Update test as result of merge
mysql-test/r/heap.result:
  update test
2005-01-08 23:32:28 +01:00
unknown
09a4872661 ndb - wl-1442 4.1->5.0 merge fixes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes
2005-01-08 23:24:25 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
f2034fdbba Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-08 22:22:41 +01:00
unknown
94504d529b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-08 21:27:22 +01:00
unknown
4c8d52aa80 few harmless warnings from automated code-checking tools fixed
client/mysql.cc:
  few harmless warnings from automated code-checking tools fixed
  cleanup
2005-01-08 21:25:31 +01:00
unknown
c86ae20457 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-08 21:16:51 +01:00
unknown
39aa7b102c ndb_constants.h:
wl-1442 comment for 4.1->5.0


ndb/include/ndb_constants.h:
  wl-1442 comment for 4.1->5.0
2005-01-08 19:37:50 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00
unknown
6e38a4cd0d Ndb.hpp: Fixed some typos and added note
about parallelism (Guide section).


ndb/include/ndbapi/Ndb.hpp:
  Fixed some typos and added note about parallelism 
  (Guide section).
2005-01-09 03:47:47 +10:00
unknown
b278ee6cc2 Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
2005-01-09 03:26:33 +10:00
unknown
f62f8f2e12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
2005-01-08 18:26:32 +01:00
unknown
c16322ada6 fixed some mgmapi docs
added example to ndbapi docs


ndb/include/mgmapi/mgmapi.h:
  fixed some mgmapi docs
ndb/include/ndbapi/Ndb.hpp:
  added examples
ndb/src/mgmapi/mgmapi.cpp:
  removed unused parameter
2005-01-08 18:25:41 +01:00
unknown
17f32ed6d9 More documentation fixes/edits to Ndb.hpp (NDB
Programmers Guide section.)


ndb/include/ndbapi/Ndb.hpp:
  More fixes/edits (finished NDB Programmers Guide section.)
2005-01-09 03:11:59 +10:00
unknown
633ee9b099 ndb - wl-1442 fix Date ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id
2005-01-08 16:57:51 +01:00
unknown
2a3f285eb5 ndb - wl-1442 updated ndb_index_ordered.result
mysql-test/r/ndb_index_ordered.result:
  wl-1442 missed result file
2005-01-08 15:18:24 +01:00
unknown
6f45da15f3 Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0


innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-08 15:06:20 +01:00