Commits · dc635e5918db1ffc8b02f8a4649cc337e47d1531 · nexedi / MariaDB

20 Jan, 2007 2 commits

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

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

dc635e59

ndb - Fix bug when sending NODE_VERSION_REP · b6c7fb39

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

b6c7fb39

19 Jan, 2007 8 commits

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

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

e6bb01b8

ndb - bug#19645 · 4e055f3f

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

4e055f3f

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

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

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

b8d02a2b

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

unknown authored Jan 19, 2007

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


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

6d7c9d86

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

ndb - bug#25711 · 3c09c1c3

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)

3c09c1c3

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

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

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

addaf4f7

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

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

7b184fa9

ndb - bug#25686 · fed5cb6a

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

fed5cb6a

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

532a2d99

16 Jan, 2007 6 commits

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

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

938ba2b4

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

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

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

a8465a04

ndb - bug#25636 · 1508bd49

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)

1508bd49

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

a9fa137d

15 Jan, 2007 2 commits

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

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

aa417a63

ndb - bug#25636 · 9ec05de3

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

9ec05de3

12 Jan, 2007 2 commits

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

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

f97eae8a

ndb - bug#25587 · 6226586c

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"

6226586c

11 Jan, 2007 5 commits

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

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

f3488d3a

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

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

a41e4eda

fix merge error · 79899496
unknown authored Jan 11, 2007

79899496

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

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

d84d59b7

ndb - bug#25554 · 45b1bdb1

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

45b1bdb1

10 Jan, 2007 1 commit

ndb - bug#25468 · e5eee3fa

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

e5eee3fa

08 Jan, 2007 8 commits

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · fb88a02d
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
```
fb88a02d

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

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

efb8265e

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

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

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

817ed402

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

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

662ee47e

bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · 81a32995
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
81a32995
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7f325a0f
unknown authored Jan 08, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
7f325a0f
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not... · 672998ea
unknown authored Jan 08, 2007
```
bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
```
672998ea