Commit graph

3276 commits

Author SHA1 Message Date
unknown
4530566d4d Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-09-26 15:07:38 +02:00
unknown
5ad0f036b1 ndb - bug#22672
handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead
2006-09-26 15:04:44 +02:00
unknown
6806ca7dfe Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-09-26 13:22:18 +02:00
unknown
4b6e6da681 ndb - bug#20895
Fix occational LCP hang!!!
  Make sure only to consider alive nodes in startNextChkpt


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure only to consider alive nodes in startNextChkpt
2006-09-26 13:19:00 +02:00
unknown
d743ce1ef1 fix for bug#19651, if temporary error occured while retoring, report it in the restore result.
ndb/tools/restore/consumer.hpp:
  added a function to judge whether there is temporary error.
ndb/tools/restore/consumer_restore.cpp:
  record when temporary error occured in restore.
ndb/tools/restore/consumer_restore.hpp:
  added a member to record temporary error in restore.
ndb/tools/restore/restore_main.cpp:
  report temporary error in restore.
2006-09-26 11:03:11 +08:00
unknown
6c167919a6 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21585
2006-09-22 20:26:27 +08:00
unknown
6cdf3c65a4 BUG#21585 The --help option shows a screen of command options for ndbd, ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.


ndb/include/util/ndb_opts.h:
  Change help info from "Ndb.cfg" string to "my.cnf" string in the header file.
ndb/test/ndbapi/flexScan.cpp:
  Change help info from including "Ndb.cfg" to "my.cnf".
ndb/tools/ndb_config.cpp:
  Change help info from including "Ndb.cfg" to "my.cnf".
2006-09-22 20:13:03 +08:00
unknown
4b08c9faa0 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2006-09-22 18:45:23 +08:00
unknown
c9983fcf0d Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1
into  bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint
2006-09-21 21:23:38 +02:00
unknown
4f00499989 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-09-21 09:48:51 +08:00
unknown
3667c4dbeb BUG #21036, myOperation->getBlobHandle(..) on non-existing column cause segmentation fault
add judgement to avoid NULL pointer's operation(segmentaion fault)


ndb/src/ndbapi/NdbOperation.cpp:
  if getColumn return NULL, set error code and return NULL in getBlobHandle
ndb/src/ndbapi/ndberror.c:
  change the err message more appropriate
2006-09-20 18:51:32 +08:00
unknown
7c96031c9a Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395
2006-09-20 11:26:29 +08:00
unknown
a51a8c1e65 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2006-09-19 18:04:47 +00:00
unknown
09a73ff56b BUG#20575 If the stopped node ids are transmitted to ndbd,
the following start, stop and restart operations aren't execute correctly


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Adding some source codes check node list whether or not stopped for STOP_REQ signal.
  If all of these nodes have stopped, then STOP_CONF signal will return.
ndb/src/mgmclient/CommandInterpreter.cpp:
  Ensure ndb_mgm can only transmit the valid range node id to management server.
  if the node id is greater than MAX_NODES, management server will exit abnormally.
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Ensure management server can only transmit the data node id to data node process.
2006-09-19 16:25:31 +08:00
unknown
abdc8c11f9 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/4.1/ndb_size_51
2006-09-19 17:56:25 +10:00
unknown
27f07d17ad BUG#21585 The --help option shows a screen of command options for the ndbd,ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains 
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.


ndb/include/util/ndb_opts.h:
  Change help info from Ndb.cfg to my.cnf in the header file.
ndb/test/ndbapi/flexScan.cpp:
  Change help info from Ndb.cfg to my.cnf.
ndb/tools/ndb_config.cpp:
  Change help info from Ndb.cfg to my.cnf
2006-09-19 11:15:50 +08:00
unknown
934b9a4ecc merge exit status from 4.1 to 5.0
ndb/src/mgmclient/CommandInterpreter.cpp:
  add right braces
2006-09-18 13:28:30 +08:00
unknown
81526834b5 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19198
2006-09-18 15:04:07 +10:00
unknown
d780368c4a Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-4.1/mysql-4.1-bug21530
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530


ndb/src/mgmclient/CommandInterpreter.cpp:
  Many methods add the return value that indicates whether the execution of operation succeeds.
  This can make ndb_mgm management client set the exit status on errors.
2006-09-18 11:36:55 +08:00
unknown
05b14821ed Merge msvensson.mysql.internal:mysql/my50-m-bug16574
into  shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:55:47 +02:00
unknown
a016cd9e19 ndb - bug#21941
Fix so that scans closed before execute are removed from "scans to send list"


ndb/include/ndbapi/NdbTransaction.hpp:
  Fix so that scans closed before execute are removed from "scans to send list"
ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix so that scans closed before execute are removed from "scans to send list"
ndb/src/ndbapi/NdbTransaction.cpp:
  Fix so that scans closed before execute are removed from "scans to send list"
2006-09-15 16:28:38 +02:00
unknown
861425a0da BUG#21530 The ndb_mgm management client doesn't set the exit status on errors, making it
almost useless for any kind of shell script automation.
          Now add the return value that indicates the execution whether or not success 
          for many methods.


ndb/src/mgmclient/CommandInterpreter.cpp:
  Many methods add the return value that indicates whether the execution of operatioin succeeds.
  This can make ndb_mgm management client set the exit status on errors.
2006-09-15 20:04:59 +08:00
unknown
dc8649bada Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2006-09-15 11:35:21 +02:00
unknown
931af3194b ndb - bug#21756
Fix for alter table when node is down...that could cause pain and misery


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Make sure to check table version before retriving from disk
2006-09-15 11:34:06 +02:00
unknown
20e2180737 ndb - bug#21535
review, Fix also master being "old" version


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix also master being "old" version
2006-09-15 11:18:17 +02:00
unknown
144cdb471a ndb - bug#21535
remove accidently left debug code


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove accidently left debug code
2006-09-14 22:05:35 +02:00
unknown
3b4dd64eaf ndb - bug#21535
send new fragdistkeys to all replicas during node recovery
  to make sure that not 3rd or 4th replicas fragDistKey becomes out of sync


ndb/include/kernel/GlobalSignalNumbers.h:
  new signal UpdateFragDistKeyOrd
ndb/include/kernel/signaldata/CopyFrag.hpp:
  new signal UpdateFragDistKeyOrd
ndb/include/ndb_version.h.in:
  online software upgrade for new signal UpdateFragDistKeyOrd
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send noew list of all replicas in copyfragreq
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  new signal UpdateFragDistKeyOrd
2006-09-14 22:01:26 +02:00
unknown
cc8b2bd218 BUG#21799 scan time out report temp failures 4008
ndb/src/ndbapi/NdbScanOperation.cpp:
  set error code to 4008 when a scan time out
2006-09-14 16:47:01 +00:00
unknown
50f0c7cdfd BUG#19787 Modify correct message when some important variables are changed but cannot be applied by online
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Modify error message when illegal configuration changed.
2006-09-14 14:34:06 +00:00
unknown
ba0d1529f5 ndb - bug#22195
also bind client to local host name if specified


ndb/src/common/transporter/Transporter.cpp:
  Add binding also of transporter connection (to hostname specified in config file)
2006-09-14 11:57:15 +02:00
unknown
afca876979 Changed to use NdbAutoPtr instead of explicit free() calls
as suggested by Jonas (still Bug #17582)
2006-09-14 00:12:17 +02:00
unknown
17bc390ac5 Make ndb_config use the same default options
as any other ndb tool in the distribution (Bug #22295)
2006-09-13 23:40:28 +02:00
unknown
ef5b4efd22 Fixed host name comparison (still Bug #17582)
mysql-test/r/ndb_config.result:
  test case for Bug #17582
mysql-test/t/ndb_config.test:
  test case for Bug #17582
ndb/tools/ndb_config.cpp:
  gethostname() returns a pointer to a static buffer so we 
  need to create a copy of the results before calling it on
  the 2nd host name, else we're effectively comparing a 
  hostname to itself which is of course always true
  (Bug #17582)
2006-09-13 23:19:18 +02:00
unknown
a74f300ff2 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-ndb
2006-09-13 15:40:48 +02:00
unknown
e64b11b094 ndb - bug#22195
allow bind address for ndbd


ndb/include/mgmapi/mgmapi.h:
  Add support for setting local address in NdbMgmHandle
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Add support for specifying local bindaddress to ConfigRetreiver
ndb/include/util/SocketClient.hpp:
  Add support for setting local address in NdbMgmHandle
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Add support for setting local address in NdbMgmHandle
ndb/src/common/util/SocketClient.cpp:
  Add support for setting local address in NdbMgmHandle
ndb/src/kernel/vm/Configuration.cpp:
  Add support for specifying local bindaddress to ndbd
ndb/src/mgmapi/mgmapi.cpp:
  Add support for setting local address in NdbMgmHandle
2006-09-13 10:09:23 +02:00
unknown
a5a48382d9 BUG#16282
Build gcc.o as a small library, instead of passing .cpp sources to the
linker command (causes problems with parallel make on Solaris).

This fix is for 4.1. In 5.0 and up a different fix is used.


ndb/config/common.mk.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
ndb/config/type_ndbapitools.mk.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
ndb/src/common/portlib/Makefile.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
ndb/src/kernel/Makefile.am:
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
2006-09-11 16:49:44 +02:00
unknown
83e24e72af Fix for Bug #20395 Cluster datanodes always assigned to nodegroup 0 during single user mode.
Data node is not allowed to get added in the cluster when it is in single user mode.


ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/mgmapi/ndbd_exit_codes.h:
  Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/ndb_version.h.in:
  added version macro for version 5.0.25.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/src/kernel/error/ndbd_exit_codes.c:
  Data node is not allowed to get added in the cluster when it is in single user mode.
2006-09-11 11:03:14 +08:00
unknown
1c45dfd2c5 #BUG21128 add function of get_cluster_loglever().
ndb/include/mgmapi/mgmapi.h:
  add one function
ndb/src/mgmapi/mgmapi.cpp:
  add one function to get cluster loglevel
ndb/src/mgmsrv/Services.cpp:
  addn one function to deal with get log level
ndb/src/mgmsrv/Services.hpp:
  add getClusterLogLevel() function define
2006-09-04 18:16:12 +00:00
unknown
53e153fd1b added print_defaults() calls to --help output for all binaries (Bug #21994)
ndb/src/cw/cpcd/main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/src/kernel/vm/Configuration.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/src/mgmclient/main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/src/mgmsrv/main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/delete_all.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/desc.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/drop_index.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/drop_tab.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/listTables.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/ndb_config.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/restore/restore_main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/select_all.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/select_count.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/waiter.cpp:
  added print_defaults() calls to --help output for all binaries
2006-09-04 16:33:56 +02:00
unknown
19dc0e4173 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb


sql/log.cc:
  Auto merged
2006-09-04 14:45:13 +02:00
unknown
6f843c13a4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-09-04 14:34:42 +02:00
unknown
beb24fbdeb Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-01 10:32:12 +02:00
unknown
efeafb2536 Fix for BUG#21345, Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
2006-09-01 15:32:40 +08:00
unknown
0afd6f1a3b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
2006-09-01 10:05:55 +08:00
unknown
20dbceb616 make DNS based hostname queries work (bug #17582) 2006-08-30 20:45:43 +02:00
unknown
49d46e0cc0 merge from ndb-5.0-ndb and ndb-5.0-ndb-bj
ndb/src/mgmclient/CommandInterpreter.cpp:
  connect() function adds a parameter in CommandInterpreter.cpp.
2006-08-29 13:31:29 +08:00
unknown
25968b7bd2 BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873


ndb/src/mgmclient/CommandInterpreter.cpp:
  ndb_mgm can automatically reconnect to the ndb_mgmd after ndb_mgmd restarted.
  and this commit fixes probable mem leak
2006-08-29 11:22:02 +08:00
unknown
fd1b3e91ca Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2006-08-29 10:59:43 +08:00
unknown
4adef258f3 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345


ndb/include/util/File.hpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
2006-08-29 10:41:07 +08:00
unknown
458cc4b9ac Fix for bug #21345: Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.
2006-08-29 09:55:07 +08:00