Commits · ceaf54782d2fced871d850af4c4d2c62aefe3d51 · nexedi / MariaDB

20 Jan, 2007 2 commits

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

unknown authored Jan 20, 2007

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


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

ceaf5478

ndb - Fix bug when sending NODE_VERSION_REP · 2c745eca

unknown authored Jan 20, 2007


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Fix bug when sending NODE_VERSION_REP
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix bug when sending NODE_VERSION_REP

2c745eca

19 Jan, 2007 8 commits

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

unknown authored Jan 19, 2007

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


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

6f6ba5dc

ndb - bug#19645 · d8628a73

unknown authored Jan 19, 2007

  fix some more sp100 hang cases


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  let suma know of API_FAILREQ even if not connected, to handle startme/handover 
    problem
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  some error inserts
  + resend API_FAILREQ during handover

d8628a73

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

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

unknown authored Jan 19, 2007

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


storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged

b168324a

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

unknown authored Jan 19, 2007

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


storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged

195bfbd3

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · add190db
unknown authored Jan 19, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
add190db
Bug#25387 ndb: dbug assert in reference counting for event operations · 57027091
unknown authored Jan 19, 2007
```
- on blob part execute failure, must leave in state executin, and await dropEventOperation
```
57027091

ndb - bug#25711 · af65dcaf

unknown authored Jan 19, 2007

  fix cpu peak in big clusters during unpack of config


ndb/src/common/util/ConfigValues.cpp:
  use bin-search instead of hash (as keys collide too much)

af65dcaf

18 Jan, 2007 2 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 6dcca17c
  unknown authored Jan 18, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  6dcca17c
- Crash in rpl_ndb_dd_advance: check for null transaction pointer · 7929c9ec
  unknown authored Jan 18, 2007
  
  7929c9ec
17 Jan, 2007 4 commits

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

unknown authored Jan 17, 2007

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


storage/ndb/include/portlib/NdbMem.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

c0f7d573

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

unknown authored Jan 17, 2007

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


storage/ndb/include/portlib/NdbMem.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge

25735d3e

ndb - bug#25686 · ba39789b

unknown authored Jan 17, 2007

  add support for doing mlockall before mallc instead of after
  (recommit in 5.0)


ndb/include/portlib/NdbMem.h:
  add support for doing mlockall before mallc instead of after
ndb/src/common/portlib/NdbMem.c:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/vm/Configuration.cpp:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/vm/Configuration.hpp:
  add support for doing mlockall before mallc instead of after
ndb/src/mgmsrv/ConfigInfo.cpp:
  add support for doing mlockall before mallc instead of after

ba39789b

Bug#25387 - added comments in code suggestion during review · 3a815cd2
unknown authored Jan 17, 2007

3a815cd2

16 Jan, 2007 6 commits

Bug#25387 - ndb: dbug assert in reference counting for event operations · a92fae08

unknown authored Jan 16, 2007

- blob event operation not reference counted correctly, missing TE_ACTIVE
- add reference counting for blobs events
- make sure also blob event operations get TE_ACTIVE
- some minor cleanups + adjustment of dbug prints

a92fae08

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

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

unknown authored Jan 16, 2007

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

06089795

ndb - bug#25636 · 64692863

unknown authored Jan 16, 2007

  additional fix after autotest
  dont send start_fragreq to temporary tables such as ordered indexes...


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  dont send START_FRAGREQ to temporary tables (such as ordered indexes)

64692863

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 4c61c37d
unknown authored Jan 16, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
4c61c37d
Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName · bf5d0eaa
unknown authored Jan 16, 2007

bf5d0eaa

15 Jan, 2007 2 commits

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

unknown authored Jan 15, 2007

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


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/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

ee5b4f6f

ndb - bug#25636 · 1f6e6b56

unknown authored Jan 15, 2007

  Fix DD problem during NR after 3 missed LCP's


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send START_FRAGREQ also for fragments wo/ LCP
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add error insert using dump

1f6e6b56

12 Jan, 2007 2 commits

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

unknown authored Jan 12, 2007

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


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

b9a2f91b

ndb - bug#25587 · c823b6e5

unknown authored Jan 12, 2007

  fix not aligned or non 32-bit values in "smart" scan


mysql-test/r/ndb_partition_key.result:
  testcase
mysql-test/t/ndb_partition_key.test:
  ndb - bug
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix unaligned or non-32-bit values in "smart scan"

c823b6e5

11 Jan, 2007 5 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 6999f6a0

unknown authored Jan 11, 2007

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


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/NodeInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Auto merged
storage/ndb/src/kernel/vm/GlobalData.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

6999f6a0

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

unknown authored Jan 11, 2007

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

05d23eef

fix merge error · b2bb44a4
unknown authored Jan 11, 2007

b2bb44a4

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

unknown authored Jan 11, 2007

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

2f88b6a5

ndb - bug#25554 · ab07c477

unknown authored Jan 11, 2007

  fix bug when master failure during nr
  (recommit against 5.0)


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  recommit against 5.0
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  recommit against 5.0
ndb/test/ndbapi/testNodeRestart.cpp:
  recommit against 5.0
ndb/test/run-test/daily-basic-tests.txt:
  recommit against 5.0

ab07c477

10 Jan, 2007 1 commit

ndb - bug#25468 · 9b9ac0f0

unknown authored Jan 10, 2007

  handle partially transfered LCP_FRAG_REP after node failure
  recommit to 51-work


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  handle partially transfered LCP_FRAG_REP after node failure
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  handle partially transfered LCP_FRAG_REP after node failure
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

9b9ac0f0

08 Jan, 2007 8 commits

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · c1ec0269
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Merged up test 5.0 case
```
c1ec0269

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 09525c3a

unknown authored Jan 08, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged

09525c3a

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 740edce0
unknown authored Jan 08, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
740edce0

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · c2f92def

unknown authored Jan 08, 2007

bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Changed test since error mesage wasn't predictable

c2f92def

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · beec5636

unknown authored Jan 08, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

beec5636

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · 8347cc2a
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
8347cc2a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 4ecb53f5
unknown authored Jan 08, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
4ecb53f5
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · c29d844c
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
c29d844c