mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-06 03:03:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43129 commits 2861 branches 349 tags 1.7 GiB
Commit graph

43129 commits

Author SHA1 Message Date
unknown
7cbef98e64 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2007-02-22 15:05:49 +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
9276064fcc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-21 18:07:48 +01:00
unknown
378a354603 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
 2007-02-21 18:06:06 +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
dfaa256466 archive_reader.c: 
Added include of m_string.h, to find 64 bit mapping of strtoll to strtol


storage/archive/archive_reader.c:
  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol
 2007-02-21 15:21:14 +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
7c7dbce216 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-21 14:31:17 +07:00
unknown
51a601238d fix c++ syntac in c file 2007-02-21 14:26:47 +07:00
unknown
fe89684aad Bug duplicate cluster error code 
- fixed error code
- added test program run in mysql-test-run bk version


mysql-test/ndb/ndbcluster.sh:
  Bug  duplicate cluster error code
  - added check for duplicate error in mysql-test run
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  Bug  duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/Makefile.am:
  Bug  duplicate cluster error code
  - added test program for duplicate error messages
storage/ndb/src/ndbapi/ndberror.c:
  Bug  duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/ndberror_check.c:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndberror_check.c''
 2007-02-21 11:41:22 +07: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
e0ef6303f9 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysys/my_thr_init.c:
  Auto merged
 2007-02-20 10:05:22 +01:00
unknown
446672d42f Fixed a bad merge. Got a duplicate symbol on OSX. 2007-02-20 10:01:54 +01:00
unknown
25aa87e6bb A few minor cleanups for recent AbortOption behaviour change. 
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Add some comments describing the new AbortOption handling.
storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp:
  Fix example to work with new AbortOption handling.
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Add forgotten method implementations.
 2007-02-20 09:52:18 +01:00
unknown
383ef7c8c2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-20 01:00:18 +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
2f7ad20547 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2007-02-19 22:56:15 +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
9ea32414e1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


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/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
 2007-02-19 21:40:34 +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
0257ba6313 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 20:52:40 +01:00
unknown
c2abf9f3a9 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


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/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2007-02-19 20:34:48 +01:00
unknown
878ed654d6 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


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/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
 2007-02-19 20:21:28 +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
7b3ca5c117 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-19 11:27:04 +07:00
unknown
1dbeb3381e Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
 2007-02-18 00:23:08 +01:00
unknown
b63f5ff30e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2007-02-17 23:57:09 +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
fbc3fe6ad4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-17 16:12:25 +07:00
unknown
d52d680087 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/main.cpp:
  Auto merged
 2007-02-16 21:44:39 +01:00
unknown
9ededefdce Merge localhost:/home/jonas/src/51-work 
into  eel.(none):/home/jonas/src/51-work
 2007-02-16 21:39:20 +01:00
unknown
cad9d6a84f ndb - atrt minor fixes 
storage/ndb/test/run-test/atrt-gather-result.sh:
  remove backup from results tars aswell
storage/ndb/test/run-test/autotest-run.sh:
  add permissions
storage/ndb/test/run-test/main.cpp:
  make it work also on dl145a
 2007-02-16 21:09:38 +01:00
unknown
2ff4bc7e09 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 18:27:08 +01:00
unknown
eb9ce41a46 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
 2007-02-16 18:25:10 +01:00
unknown
3b6dad3bd3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
 2007-02-16 18:23:54 +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
24a20fbe91 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
 2007-02-16 18:16:22 +01:00
unknown
574e71e276 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
 2007-02-16 18:14:41 +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
5328b8dc7f Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/mysql_priv.h:
  Auto merged
 2007-02-16 12:07:01 +01:00
unknown
920096defe Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-16 12:05:57 +01:00
unknown
ba1de16601 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-16 10:39:45 +01:00
unknown
c3b61cde0b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-16 16:16:28 +07:00