Commit graph

1856 commits

Author SHA1 Message Date
unknown
477205f776 ndb - wl-1203 alignment fix
ndb/include/ndb_constants.h:
  consistent names
ndb/include/ndbapi/NdbDictionary.hpp:
  consistent names
ndb/include/util/NdbSqlUtil.hpp:
  consistent names
ndb/src/common/util/NdbSqlUtil.cpp:
  minor completion
ndb/src/ndbapi/NdbOperationInt.cpp:
  alignment fix
2005-02-26 16:56:39 +01:00
unknown
dde2e462f1 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/drop_tab.cpp:
  Auto merged
2005-02-24 20:58:26 +01:00
unknown
2f7fde4877 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-24 20:57:32 +01:00
unknown
a9201bf6eb bug#8786 - ndb_autodiscover - 5.0 specific details
Wait some for all nodes to get connected


ndb/tools/drop_index.cpp:
  Wait some for all nodes to get connected
ndb/tools/drop_tab.cpp:
  Wait some for all nodes to get connected
2005-02-24 20:56:59 +01:00
unknown
1c2ea24efa Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-24 20:48:33 +01:00
unknown
185a811e8e Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-24 19:01:36 +01:00
unknown
6b38100d61 bug#8786 - ndb autodiscover, sometimes fails
remove dict forwarding
  add api retries on NotMaster
  


ndb/include/kernel/signaldata/AlterIndx.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/CreateTrig.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/DropIndx.hpp:
  Add NotMaster error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Never forward requests,
    instead REF to API who will retry towards correct node
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  1) Set error code for timeout
  2) Handle NotMaster with retry in all DICT requests
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Fix so that input values is in seconds and not 100ms's
sql/ha_ndbcluster.cc:
  Wait 3 sec for all nodes to connect...
2005-02-24 18:58:56 +01:00
unknown
48429203a8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-24 13:07:34 +01:00
unknown
161a434944 ndb - wl-1203 fix binary LIKE binary in ndb api
mysql-test/r/ndb_condition_pushdown.result:
  fix binary LIKE binary in ndb api
mysql-test/t/ndb_condition_pushdown.test:
  fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbOperationInt.cpp:
  fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbScanFilter.cpp:
  fix binary LIKE binary in ndb api
2005-02-24 13:07:33 +01:00
unknown
dcdbfa6527 merge
BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-24 06:24:46 +01:00
unknown
885e13aba2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2005-02-24 06:19:41 +01:00
unknown
a23c1bf64e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 06:18:02 +01:00
unknown
f4cef73bd7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 06:14:43 +01:00
unknown
137136d2a5 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-23 17:20:01 +01:00
unknown
fed291dd7b added testcase for events where a "shadow table" is created 2005-02-23 16:57:07 +01:00
unknown
5a442d6af6 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/item.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_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-23 15:54:22 +01:00
unknown
26c93519a9 Merge
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
ndb/src/kernel/main.cpp:
  merge
2005-02-23 10:29:31 +01:00
unknown
c03c9b2424 Merge
ndb/src/kernel/main.cpp:
  merge
2005-02-23 10:16:56 +01:00
unknown
e1d76d1663 removed printout "- Repeated 1 times"
make sure transporter connections are close early in shutdown


ndb/src/common/logger/LogHandler.cpp:
  removed printout "- Repeated 1 times"
ndb/src/kernel/main.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.hpp:
  make sure transporter connections are close early in shutdown
2005-02-23 10:12:26 +01:00
unknown
3bd6f299fc fixed bug that event subscriptions are not dropped correctly on api failure
+ added debug printout
2005-02-22 23:28:54 +01:00
unknown
30bba02da3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-02-22 18:29:57 +01:00
unknown
55d0f258ad making sure that the client connect loop and server accept is stopped early at ndbd shutdown 2005-02-22 18:28:53 +01:00
unknown
61964b70a9 ndb - move benchmark to basic suite
ndb/test/run-test/daily-basic-tests.txt:
  move bench to basic suite
ndb/test/run-test/daily-devel-tests.txt:
  move bench to basic suite
2005-02-22 13:58:25 +01:00
unknown
43a51297ca Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 12:18:39 +01:00
unknown
bad40874a0 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 12:17:27 +01:00
unknown
000cef80f5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 12:15:56 +01:00
unknown
bf88db5c20 wl1292 - ndb autotest - fix html reporting bug
ndb/test/run-test/ndb-autotest.sh:
  use correct path when packing result tar ball
2005-02-22 12:15:27 +01:00
unknown
78757c18b3 ndb - testBitfield
remove unused method that gave compile error -pedantic


ndb/test/ndbapi/testBitfield.cpp:
  remove unused method that gave compile error -pedantic
2005-02-22 11:09:04 +01:00
unknown
a277a9eca6 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 10:25:30 +01:00
unknown
8094ac95d5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
unknown
e84aaa8b0d Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1


BitKeeper/deleted/.del-example.conf:
  Delete: ndb/test/run-test/example.conf
BitKeeper/deleted/.del-ndb-autotest.sh:
  Delete: ndb/test/run-test/ndb-autotest.sh
2005-02-22 10:20:35 +01:00
unknown
029f10dd85 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
unknown
fe82f47405 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 00:32:33 +01:00
unknown
8a40c5c71d corrected error in ndb programs debug switch 2005-02-21 23:15:30 +01:00
unknown
45064a4acc removed double declaration of opt_connect_str 2005-02-21 19:50:13 +01:00
unknown
a2bb52c748 Merge
sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-21 16:13:29 +01:00
unknown
c596940e3c bug#8645 - ndb - ndb_mgmd nodeid handling
(not to be merged as code has changed in 5.0)


ndb/src/mgmapi/LocalConfig.cpp:
  Allow connecstring = "nodeid=X"
ndb/src/mgmsrv/MgmtSrvr.cpp:
  remove incorrect asserts
2005-02-21 15:22:01 +01:00
unknown
448a4fd1f1 ndb - fix TUP filtering of LIKE / NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
  1. fix wild_* chars 2. use correct wildcmp return value
ndb/src/common/util/NdbSqlUtil.cpp:
  1. fix wild_* chars 2. use correct wildcmp return value
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  1. fix wild_* chars 2. use correct wildcmp return value
2005-02-21 14:17:21 +01:00
unknown
e7038f4339 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-21 14:17:20 +01:00
unknown
453809f3a4 Fix compiler warning/crash(ds20)
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Moved ndbrequire and break down one line, to avoid warnings and compiler crash
2005-02-21 14:01:36 +01:00
unknown
e8be468b04 changed switch name from --ndb-mgmd-host to --ndb-mgmd
+ simplified code
2005-02-21 13:42:55 +01:00
unknown
dffefb3039 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-21 10:51:26 +01:00
unknown
2403965d13 ndb - allow LIKE with Binary strings
ndb/include/util/NdbSqlUtil.hpp:
  allow LIKE with Binary strings
ndb/src/common/util/NdbSqlUtil.cpp:
  allow LIKE with Binary strings
2005-02-21 10:44:37 +01:00
unknown
318712548c 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-21 09:46:18 +01:00
unknown
5d4ac97298 ndb - compiler warning - remove extra ; and end of function
ndb/src/common/transporter/TransporterRegistry.cpp:
  extra ; and end of function
2005-02-21 08:40:59 +01:00
unknown
a89dcc587a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-21 06:56:26 +01:00
unknown
f092e1a2cb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-21 06:54:29 +01:00
unknown
73f6b11845 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-20 22:35:00 +01:00
unknown
551df1b356 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-20 21:00:14 +01:00
unknown
0233bb35f1 NdbSqlUtil.cpp:
duplicate of previous cs to 5.0-ndb


ndb/src/common/util/NdbSqlUtil.cpp:
  duplicate of previous cs to 5.0-ndb
2005-02-20 20:57:50 +01:00