Commit graph

2509 commits

Author SHA1 Message Date
unknown
cf358493ca Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  merge
2005-09-21 17:27:04 +02:00
unknown
3c8a296f28 bug#12950
ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data


ndb/src/kernel/blocks/backup/Backup.cpp:
  Backup can do dirty read
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix so that backup dont read xfrm data
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix so that backup dont read xfrm data
2005-09-21 17:24:39 +02:00
unknown
90b102daa6 BUG#11595 ndb_mgm shows from IP for second mgmd
BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes

Extend ApiVersionConf to include address.


ndb/include/kernel/signaldata/ApiVersion.hpp:
  Extend ApiVersionConf to include inet_addr. the address used for communication to this node.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  include connect address in ApiVersionConf
ndb/src/mgmsrv/MgmtSrvr.cpp:
  ::status() now also returns char* address of the node.
  For API or MGM, this is in ApiVersionConf.
  For NDB, this is the standard get_connect_address.
  
  When sending ApiVersionReq, try to send to a STARTED node (as these have
  properly joined the cluster and know the connect addresses).
  
  If versionNode is called for getOwnNodeId()==nodeId, try to get the address
  via ApiVersionConf. If that fails, look it up in the configuration.
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add char **address to prototypes.
ndb/src/mgmsrv/Services.cpp:
  Get the connect address from mgmsrv.status()
2005-09-22 00:41:46 +10:00
unknown
73d382f6ca Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-20 12:52:42 +02:00
unknown
16328ca215 ndb - post merge fixes
ndb/include/ndbapi/NdbTransaction.hpp:
  post merge fixes
ndb/src/ndbapi/Ndblist.cpp:
  post merge fixes
sql/ha_ndbcluster.cc:
  post merge fixes
2005-09-20 12:07:18 +02:00
unknown
130e902cf1 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/Ndb.hpp:
  merge
ndb/include/ndbapi/NdbIndexOperation.hpp:
  merge
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  merge
ndb/include/ndbapi/NdbTransaction.hpp:
  merge
ndb/src/ndbapi/NdbImpl.hpp:
  merge
ndb/src/ndbapi/Ndblist.cpp:
  merge
ndb/test/src/HugoCalculator.cpp:
  merge
ndb/test/src/NDBT_Test.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/mysqld.cc:
  merge
sql/sql_lex.h:
  merge
sql/sql_parse.cc:
  merge
2005-09-20 10:46:33 +02:00
unknown
ae3680c59b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-09-20 10:35:47 +02:00
unknown
0c84cf4c0d Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption 2005-09-20 10:34:00 +02:00
unknown
8c963d3967 Remove old and usused configuration locking code.
Some new code that does this job is being written against 5.1. This code is
largely removed from that work.


ndb/include/kernel/GlobalSignalNumbers.h:
  remove dead (never used) MGM_(UN)LOCK signal numbers
ndb/src/mgmsrv/Config.cpp:
  remove unused generation number code.
  
  remove unused Config::change
ndb/src/mgmsrv/Config.hpp:
  remove unused generation number prototypes.
ndb/src/mgmsrv/MgmtSrvr.cpp:
  remove unused getPrimaryNode
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove prototypes for config lock and commit/rollback.
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  remove CONFIG (UN)LOCK signals, lockConf/unlockConf, commit/rollback and changeConfig.
  
  never used.
ndb/src/mgmsrv/Services.cpp:
  remove unused configuration locking code
ndb/src/mgmsrv/Services.hpp:
  remove usused configuration locking code
2005-09-20 17:34:46 +10:00
unknown
730fc4156d Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
2005-09-19 15:31:09 +02:00
unknown
90e6060858 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
2005-09-19 15:00:13 +02:00
unknown
7150244e50 bug#9282 - ndb
big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 


ndb/src/ndbapi/Ndbinit.cpp:
  Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
  Protect NdbObjectIdMap::expand from getObjectId
2005-09-19 14:05:54 +02:00
unknown
f12f98e226 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-17 10:05:07 +02:00
unknown
d0eb3e2842 ndb
remove extra ";" from test programs


ndb/test/include/NDBT_Test.hpp:
  Remove extra ";"
ndb/test/ndbapi/bank/BankLoad.cpp:
  Remove extra ";"
ndb/test/ndbapi/testOIBasic.cpp:
  Remove extra ";"
ndb/test/src/HugoCalculator.cpp:
  Remove extra ";"
ndb/test/src/NDBT_Test.cpp:
  Remove extra ";"
ndb/test/src/NdbBackup.cpp:
  Remove extra ";"
ndb/test/src/NdbRestarts.cpp:
  Remove extra ";"
2005-09-16 14:18:27 +02:00
unknown
979563399b ndb
impl support for querying resource usage in ndb api
  to help track down mem leaks


ndb/include/ndbapi/Ndb.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbBlob.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbConnection.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbOperation.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbRecAttr.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbApiSignal.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbApiSignal.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbBlob.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbImpl.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbRecAttr.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbUtil.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbUtil.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/Ndbif.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/Ndbinit.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/Ndblist.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/tools/restore/Restore.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
2005-09-16 11:26:34 +02:00
unknown
c8fde9f33e Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0


ndb/tools/ndb_config.cpp:
  Auto merged
2005-09-16 01:39:12 +02:00
unknown
2b6f6d6ce6 compare host names by address lookup instead of simple string comparison 2005-09-16 00:15:47 +02:00
unknown
6363fd5712 ndb - bug#9994 backpatch fixes from 5.0
IGNORE on merge 4.1->5.0


ndb/src/kernel/blocks/ERROR_codes.txt:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  bug#9994 backpatch fixes from 5.0
2005-09-15 14:48:49 +02:00
unknown
f1cc9494b9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-mgmd
into  mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
2005-09-15 17:42:36 +10:00
unknown
c6ff73b91f BUG#13136 NdbTCP.cpp compile failure on OSX 10.2
use select if poll is unavailable.


ndb/src/common/portlib/NdbTCP.cpp:
  Implement Ndb_check_socket_hup for systems without poll(2)
ndb/src/common/portlib/win32/NdbTCP.c:
  fix typo (found while fixing this bug)
2005-09-15 00:21:25 +10:00
unknown
da5ffc732c WL#2779 ndb_size.pl
Bug reported by Adam Dixon - table name needs quoting.


ndb/tools/ndb_size.pl:
  Always quote the table and database names when sending to cluster.
2005-09-14 16:28:19 +10:00
unknown
c53e51afb6 merge 2005-09-13 13:18:14 +02:00
unknown
b51879f169 minor compile error fix 2005-09-13 10:03:50 +02:00
unknown
8dc5c95b14 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts
2005-09-12 17:00:50 -07:00
unknown
03a5e223af corrected prev patch on ndb_mgmd usage of SignalSender 2005-09-13 00:22:06 +02:00
unknown
e63bb69650 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2005-09-12 22:53:31 +02:00
unknown
a100123ab3 adopted to corrected ndb SendSignal Node failrep 2005-09-12 22:51:44 +02:00
unknown
3f40506633 Corrected construct of faked Node fail signals in ndb SignalSender 2005-09-12 17:49:48 +02:00
unknown
45433e7813 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-12 16:08:59 +02:00
unknown
c1c2a8920c reengineered ndb_mgmd to use SignalSender and remove some multi user issues 2005-09-12 16:08:16 +02:00
unknown
c29e0f709c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 14:30:52 +02:00
unknown
4efcca023b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


mysql-test/t/rpl_slave_status.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2005-09-12 14:11:28 +02:00
unknown
0a3202bedf removed a few aborts from mgmapi
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
unknown
f28e81d03e W#2776 Utility for calculating storage requirements for NDB
Initial ndb_size.pl

Connects to an existing MySQL database and produces a XHTML document containing
an estimation of storage requirements.


ndb/tools/ndb_size.pl:
  Initial checkin of ndb_size.pl
ndb/tools/ndb_size.tmpl:
  Initial checkin of XHTML template file for ndb_size.pl
2005-09-12 15:54:23 +10:00
unknown
513269e7f2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-10 01:50:38 +02:00
unknown
11fef7846c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2005-09-09 17:17:44 -04:00
unknown
8a9d9e7950 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 19:02:13 +02:00
unknown
eebb35945b Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-09 13:53:49 +02:00
unknown
394d180b5e merge fixes 2005-09-09 13:14:35 +02:00
unknown
011f12d014 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  merge
ndb/test/ndbapi/bank/Bank.cpp:
  merge
ndb/test/ndbapi/bank/Bank.hpp:
  merge
ndb/test/src/UtilTransactions.cpp:
  merge
2005-09-09 12:54:03 +02:00
unknown
b1fab24ce2 ndb
new testprogram testSRBank


BitKeeper/etc/ignore:
  Added ndb/test/ndbapi/testSRBank to the ignore list
ndb/test/include/NDBT_Test.hpp:
  incProperty
ndb/test/ndbapi/Makefile.am:
  new test program
ndb/test/ndbapi/bank/Bank.cpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/ndbapi/bank/Bank.hpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/src/NDBT_Test.cpp:
  incProperty
ndb/test/src/UtilTransactions.cpp:
  close transaction if failed
ndb/test/ndbapi/testSRBank.cpp:
  New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''
2005-09-09 12:39:06 +02:00
unknown
1266ccc899 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/ndbapi/SignalSender.cpp:
  Merge
2005-09-09 00:22:36 -04:00
unknown
a49e23ad84 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  SCCS merged
2005-09-08 22:47:41 -04:00
unknown
168f72db51 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-08 19:28:19 -04:00
unknown
2b17f75073 Fix -ansi -pedantic compilation failure. 2005-09-09 02:01:04 +04:00
unknown
91d05c5234 SignalSender.cpp:
fixed compile error


ndb/src/ndbapi/SignalSender.cpp:
  fixed compile error
2005-09-08 19:27:37 +02:00
unknown
e2178591a7 Merge mikael@ndb.mysql.com:/home/mikael/bug12594
into  mysql.com:/Users/mikron/mysql-4.1
2005-09-08 18:30:13 +02:00
unknown
d5028e2c5a Bug #12594: A few fixes
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Fixed a bug and an issue with the added debug code for finding
  redo log write mistakes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fixed a bug and an issue with the added debug code for finding
  redo log write mistakes
  Removed a number of unnecessary break's
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Added printouts of new debug info in log page header
2005-09-08 18:24:42 +02:00
unknown
e61d56a985 corrected type 2005-09-08 16:51:35 +02:00
unknown
110230beec corrected typo 2005-09-08 16:47:27 +02:00