Commit graph

2491 commits

Author SHA1 Message Date
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
unknown
48e97a16c7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-08 16:44:54 +02:00
unknown
66d6ae2c90 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
2005-09-08 15:59:06 +02:00
unknown
9c5dd6a233 corrected printouts in backup test
ndb/src/kernel/blocks/backup/Backup.hpp:
  missed this file in prev commit
ndb/test/src/NdbBackup.cpp:
  corrected printouts in backup test
2005-09-08 15:43:46 +02:00
unknown
ef0a284a4c corrected prev fix for bug #13054
so that _only_ backup master replies to API
2005-09-08 15:24:21 +02:00
unknown
14b92d3054 Bug #12594:
Added debug info to all log page headers
2005-09-08 11:53:17 +02:00
unknown
e53871c38a Bug #13054 start backup command return may be interrpted 2005-09-08 11:34:55 +02:00
unknown
7c554639c5 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug11607


ndb/src/ndbapi/NdbTransaction.cpp:
  SCCS merged
2005-09-08 15:11:56 +10:00
unknown
f5df855f3c Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
2005-09-08 15:06:01 +10:00
unknown
c9106a9537 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0


ndb/src/common/portlib/NdbThread.c:
  Auto merged
2005-09-07 14:51:57 +02:00
unknown
43fb5cd358 ndb - bug#11623 - "ndb become inresponsive but did not really die"
block signals in threads making main process get all signals...
2005-09-07 14:04:36 +02:00
unknown
e6438062db Modified ndb log message on startup failure 2005-09-07 12:49:11 +02:00
unknown
7b2aacb73d Merge
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  merge
ndb/tools/Makefile.am:
  merge
ndb/tools/restore/restore_main.cpp:
  merge
2005-09-06 09:01:17 +02:00
unknown
4a584b17e8 added --core-file option to ndb executables
added parseable printout in ndb_restore
2005-09-05 16:33:40 +02:00
unknown
b48e721d2f Merge mysql.com:/usr/home/ram/work/4.1.b4214
into  mysql.com:/usr/home/ram/work/mysql-5.0


myisam/mi_check.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/mi_static.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
myisam/myisampack.c:
  merging
2005-09-05 18:28:56 +05:00
unknown
354fa102a3 Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitly 2005-09-05 15:14:44 +02:00
unknown
4345853ee2 added timestamp to shutdown messages in ndbd 2005-09-05 09:29:28 +02:00
unknown
0ef8580820 fixed small bug in ndb redolog printer
+ added option to dumpe rest of page after exnd of data


ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  fixed small bug in ndb redolog printer
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  fixed small bug in ndb redolog printer
2005-09-05 09:13:28 +02:00
unknown
8c1b55ef71 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0


ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  merge
2005-09-02 12:03:58 +02:00