Commits · 378a3546032ae1a21714e62c96c5a0ff7eeaa655 · nexedi / MariaDB

21 Feb, 2007 7 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 378a3546

unknown authored Feb 21, 2007

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

378a3546

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · d8a5d43c

unknown authored Feb 21, 2007

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

d8a5d43c

ndb - · 40bfc4c0

unknown authored Feb 21, 2007

  Make StartREDO come up as default in cluster log


ndb/src/common/debugger/EventLogger.cpp:
  Make StartREDO come up as default in cluster log

40bfc4c0

ndb - bug#26515 · a62c32bd

unknown authored Feb 21, 2007

  make sure logPartPtr is correctly initialized


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix bug#26515
    make sure logPartPtr is correctly initialized

a62c32bd

Merge localhost:/home/jonas/src/51-work · a50426e1
unknown authored Feb 21, 2007
```
into  eel.(none):/home/jonas/src/51-work
```
a50426e1

ndb - bug#26514 · 95a477b5

unknown authored Feb 21, 2007

  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

95a477b5

ndb - bug#26487 · 1266d244

unknown authored Feb 21, 2007

  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

1266d244

20 Feb, 2007 2 commits

ndb - · e6db379e

unknown authored Feb 20, 2007

  write testcase for bug#26450...
  no solution however...


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  write testcase for bug#26450...
  no solution however...

e6db379e

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 383ef7c8
unknown authored Feb 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
383ef7c8

19 Feb, 2007 13 commits

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 41b7a60d

unknown authored Feb 20, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

41b7a60d

fix compile error in testBitfield · 65e7108f
unknown authored Feb 20, 2007

65e7108f

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 2f7ad205

unknown authored Feb 19, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

2f7ad205

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 70a9812d

unknown authored Feb 19, 2007

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

70a9812d

ndb - fix correct argv/argc handling in testBitfield · 2afacafb
unknown authored Feb 19, 2007
```
ndb/test/ndbapi/testBitfield.cpp:
  fix correct argv/argc handling in testBitfield
```
2afacafb

ndb - · 2f58470f

unknown authored Feb 19, 2007

  forgott to add testcase for bug#26481


ndb/test/run-test/daily-basic-tests.txt:
  forgott to add testcase for bug#26481

2f58470f

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 9ea32414

unknown authored Feb 19, 2007

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

9ea32414

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · cb3b2a36

unknown authored Feb 19, 2007

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

cb3b2a36

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 0257ba63
unknown authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
0257ba63

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · c2abf9f3

unknown authored Feb 19, 2007

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

c2abf9f3

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 878ed654

unknown authored Feb 19, 2007

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

878ed654

ndb - bug#26481 · 85fdd106

unknown authored Feb 19, 2007

  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

85fdd106

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 7b3ca5c1
unknown authored Feb 19, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
7b3ca5c1

17 Feb, 2007 4 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 1dbeb338

unknown authored Feb 18, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge

1dbeb338

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b63f5ff3

unknown authored Feb 17, 2007

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

b63f5ff3

ndb - bug#26457 · 778b4aad

unknown authored Feb 17, 2007

  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)

778b4aad

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · fbc3fe6a
unknown authored Feb 17, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
fbc3fe6a

16 Feb, 2007 14 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · d52d6800

unknown authored Feb 16, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/main.cpp:
  Auto merged

d52d6800

Merge localhost:/home/jonas/src/51-work · 9ededefd
unknown authored Feb 16, 2007
```
into  eel.(none):/home/jonas/src/51-work
```
9ededefd

ndb - atrt minor fixes · cad9d6a8

unknown authored Feb 16, 2007


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

cad9d6a8

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 2ff4bc7e
unknown authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
2ff4bc7e

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · eb9ce41a

unknown authored Feb 16, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged

eb9ce41a

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 3b6dad3b

unknown authored Feb 16, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge

3b6dad3b

ndb - bug in my.cnf handling on resize of vector · 0e39133a
unknown authored Feb 16, 2007
```
  backport fix from 5.1


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  backport fix from 5.1
```
0e39133a

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 24a20fbe

unknown authored Feb 16, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged

24a20fbe

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 574e71e2

unknown authored Feb 16, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged

574e71e2

ndb - bug#26454 · 2cd7831f

unknown authored Feb 16, 2007

  make lockpages=1 run a bit earlier in startup


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  change order

2cd7831f

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c3b61cde
unknown authored Feb 16, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
c3b61cde
Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 5eff43c3
unknown authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
5eff43c3

ndb - autotest · 746f990d

unknown authored Feb 16, 2007

  increase timeout on slow test


storage/ndb/test/run-test/daily-basic-tests.txt:
  increase timeout...cause test is slow

746f990d

ndb autotest - · ed1a033c

unknown authored Feb 16, 2007

  Fix testcase so that it does not leak tables...causing subsequent errors


storage/ndb/test/ndbapi/testDict.cpp:
  Fix testcase so that it does not leak tables...

ed1a033c