Commit graph

42454 commits

Author SHA1 Message Date
unknown
7473c70b8e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore


BitKeeper/deleted/.del-ndb_backup.inc:
  Delete: mysql-test/include/ndb_backup.inc
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_printer.cpp:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  manual merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge
storage/ndb/tools/restore/Restore.cpp:
  manual merge
storage/ndb/tools/restore/Restore.hpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge
2007-03-07 13:44:54 +07:00
unknown
2d797068f1 Bug#26899 ndb_restore cannot restore selected tables and databases
Bug#26900 ndb_restore printout option does not give structured data
  - test cases
2007-03-07 13:19:37 +07:00
unknown
16fc4db1e1 Bug#26899 ndb_restore cannot restore selected tables and databases
Bug#26900 ndb_restore printout option does not give structured data
- add data stucturing options
- add database and table selection options


ndb/include/ndbapi/NdbRecAttr.hpp:
  add formatting option to ndb recattr printing
ndb/include/util/OutputStream.hpp:
  getter for FILE*
ndb/src/ndbapi/NdbRecAttr.cpp:
  add formatting option to ndb recattr printing
ndb/tools/restore/Restore.cpp:
  add formatting option to restore printing
  adoption to 5.1 source code
ndb/tools/restore/Restore.hpp:
  restore adoption to 5.1
ndb/tools/restore/consumer_printer.cpp:
  add formatting option to restore printing
ndb/tools/restore/restore_main.cpp:
  added option to restore only selected databases and tables
  added option to get CSV printout to file and stdout
  add formatting option to restore printing
  adoption to 5.1 source code
2007-03-07 13:18:08 +07:00
unknown
690b46cfe2 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge, use local copy
2007-03-07 10:43:21 +07:00
unknown
a58b9b050a source code indentation alignment with 5.1, no real change 2007-03-07 10:37:30 +07:00
unknown
6f7bf53e98 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2007-03-07 08:12:44 +07:00
unknown
cddc768751 ndb -
fix printout
  crashes testSystemRestart -n SR_UNDO


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix printout
  crashes testSystemRestart -n SR_UNDO
2007-03-07 08:11:16 +07:00
unknown
3fcc6915b2 ndb -
fix printout
  crashes testSystemRestart -n SR_UNDO


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix printout
  crashes testSystemRestart -n SR_UNDO
2007-03-02 11:48:14 +01:00
unknown
be3d4002f7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
2007-03-02 11:41:21 +01:00
unknown
af0554d133 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
2007-03-02 09:13:00 +07:00
unknown
87c5e84f93 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
(part 1)
- add signal data
- add ref in dict on create/drop table/index
2007-03-02 09:06:05 +07:00
unknown
1301de42c1 Bug #26720 Infinite loop on unknown signal in logging function
- terminate printing
2007-03-02 08:56:22 +07:00
unknown
d080df7765 Bug #26741 ndb_restore with only print_data seg faults
- only creat systable if conencted to ndb
2007-03-01 11:07:24 +07:00
unknown
23c33249b7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge
2007-03-01 08:45:26 +07:00
unknown
f9bfa7806e ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
ndb - 5.1.16 uint64 align for ndb_restore
(backport)


ndb/src/ndbapi/NdbRecAttr.cpp:
   ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
  (backport)
ndb/tools/restore/Restore.cpp:
   ndb - 5.1.16 uint64 align for ndb_restore
  (backport)
2007-03-01 08:34:59 +07:00
unknown
7c1572de78 corrected manual merge 2007-02-26 23:52:11 +07:00
unknown
0b60b1d3b7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge
storage/ndb/src/ndbapi/SignalSender.cpp:
  manual merge
2007-02-26 23:50:02 +07:00
unknown
4c3a363b5e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-22 15:35:10 +01:00
unknown
b5b3c616d5 ndb - bug#26481 - fix of bug fix 5.0 version 2007-02-22 15:31:21 +01:00
unknown
dc4d8ec6db ndb - bug#26481 - fix of bug fix
Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...START_RECREQ is not enough



storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...
  START_RECREQ is not enough
2007-02-22 15:02:48 +01:00
unknown
d8a5d43cf1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2007-02-21 18:03:17 +01:00
unknown
40bfc4c018 ndb -
Make StartREDO come up as default in cluster log


ndb/src/common/debugger/EventLogger.cpp:
  Make StartREDO come up as default in cluster log
2007-02-21 18:01:04 +01:00
unknown
a62c32bd7d ndb - bug#26515
make sure logPartPtr is correctly initialized


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix bug#26515
    make sure logPartPtr is correctly initialized
2007-02-21 18:00:12 +01:00
unknown
a50426e12b Merge localhost:/home/jonas/src/51-work
into  eel.(none):/home/jonas/src/51-work
2007-02-21 16:44:39 +01:00
unknown
95a477b5ec ndb - bug#26514
fix overflow that could occur when have either lots of dd-data or very high dd-parallelism


storage/ndb/src/kernel/vm/RWPool.cpp:
  Add define for sizeof WOPage
  Make sure correct size is used when checking for end of page
storage/ndb/src/kernel/vm/RWPool.hpp:
  Add define for sizeof RWPage
storage/ndb/src/kernel/vm/WOPool.cpp:
  Add define for sizeof WOPage
  Make sure correct size is used when checking for end of page
storage/ndb/src/kernel/vm/WOPool.hpp:
  Add define for sizeof WOPage
  Make sure correct size is used when checking for end of page
2007-02-21 16:33:16 +01:00
unknown
1266d24477 ndb - bug#26487
fix bug in extent/page allocation when *using* >1gb datafiles


storage/ndb/src/kernel/blocks/tsman.cpp:
  Make sure correct page id is returned even if on extent page 2
2007-02-21 14:40:15 +01:00
unknown
e6db379e46 ndb -
write testcase for bug#26450...
  no solution however...


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  write testcase for bug#26450...
  no solution however...
2007-02-20 20:33:53 +01:00
unknown
41b7a60df4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
2007-02-20 00:58:25 +01:00
unknown
65e7108f69 fix compile error in testBitfield 2007-02-20 00:55:33 +01:00
unknown
70a9812d8a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-02-19 22:53:17 +01:00
unknown
2afacafb78 ndb - fix correct argv/argc handling in testBitfield
ndb/test/ndbapi/testBitfield.cpp:
  fix correct argv/argc handling in testBitfield
2007-02-19 22:51:04 +01:00
unknown
2f58470f5d ndb -
forgott to add testcase for bug#26481


ndb/test/run-test/daily-basic-tests.txt:
  forgott to add testcase for bug#26481
2007-02-19 22:30:54 +01:00
unknown
cb3b2a36be Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-02-19 21:19:21 +01:00
unknown
85fdd106bd ndb - bug#26481
fix for killed node during initial node restart


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Check cstartRecReq also when refusing GCP_SAVEREQ
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase
2007-02-19 20:13:08 +01:00
unknown
778b4aad59 ndb - bug#26457
master failure during master take over


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure to clear NF_XX_LCP if master fails during master take-over
ndb/test/include/NdbRestarter.hpp:
  Add support for querying next master and node group
    (for multi node failure testing)
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase
ndb/test/src/NdbRestarter.cpp:
  Add support for querying next master and node group
    (for multi node failure testing)
2007-02-17 23:52:17 +01:00
unknown
0e39133ad7 ndb - bug in my.cnf handling on resize of vector
backport fix from 5.1


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  backport fix from 5.1
2007-02-16 18:20:24 +01:00
unknown
2cd7831fb5 ndb - bug#26454
make lockpages=1 run a bit earlier in startup


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  change order
2007-02-16 18:10:27 +01:00
unknown
5a25c67a59 Bug #21033 Error 0 in readAutoIncrementValue()
- do not call function if table has no autoincrement
2007-02-14 15:16:26 +07:00
unknown
00b143b439 make sure some printouts in ndbd out file is done with g_eventLogger 2007-02-14 11:16:10 +07:00
unknown
9ed1b84346 Bug#26293 cluster mgmt node sometimes doesn't receive events from all nodes on restart
- signals where sometimes sent too early when setting up subscriptions


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  added dump for active subscriptions in cmvmi
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  added dump for active subscriptions in cmvmi
ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug in that signals where sent prior to api reg conf arrived, causing thrown away signals and subsequent hangs in mgmtserver
  also add retry if node connected but not yet received api reg conf
ndb/src/ndbapi/ClusterMgr.cpp:
  added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable
ndb/src/ndbapi/ClusterMgr.hpp:
  added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable
ndb/src/ndbapi/SignalSender.cpp:
  assert to see that node is sendable when signal is sent
ndb/src/ndbapi/SignalSender.hpp:
  manke metchd const
2007-02-14 11:05:38 +07:00
unknown
5af0cbc7ce apply holyfoot's patch for BUG#25895 2007-01-29 14:47:38 +01:00
unknown
d5ada3e15d Build fix for sunfire100b. This can go when BUG#14420 is fixed.
dbug/dbug.c:
  Build fix for sunfire100b. The ld does not want to link with an empty library, so we put something in it.
dbug/factorial.c:
  Build fix for sunfire100b. When DBUG_OFF is defined, dbug is not there, and we can't use it even if we try, period.
2007-01-27 22:07:52 +01:00
unknown
20e5e1d2fb BUG#25890 put previous fix in better place 2007-01-27 21:26:28 +01:00
unknown
915c9f4dfc BUG#25895 compiling the server with embedded fails on several 64-bit platforms
temporary fix


libmysqld/lib_sql.cc:
  BUG#25895 compiling the server with embedded fails on several 64-bit platforms
  
  do not try to cast THD* to pthread_t, this operation is not possible
2007-01-27 20:16:15 +01:00
unknown
452e07679b BUG#25890 mysqltest_embedded crashes on start
very temporary fix


libmysqld/lib_sql.cc:
  BUG#25890 mysqltest_embedded crashes on start
  
  temporary fix - initialize needed global variables
2007-01-27 13:12:59 +01:00
unknown
823498926c fix order in spec file changelog
support-files/mysql.spec.sh:
  fix order in changelog
2007-01-27 12:46:20 +01:00
unknown
9cbdb2edab SETUP.sh:
Don't use -Wshadow by default yet


BUILD/SETUP.sh:
  Don't use -Wshadow by default yet
2007-01-25 13:12:02 +01:00
unknown
25f3230037 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new-ndb
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:38:35 +01:00
unknown
a0a847fd45 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel


mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
2007-01-25 12:28:00 +01:00
unknown
d134dd4501 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 18:14:51 +07:00