Commits · f1aaf6f6aced0884c43e982ba6416c68bea07cb3 · nexedi / MariaDB

06 Mar, 2007 1 commit

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · f1aaf6f6

unknown authored Mar 06, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

f1aaf6f6

02 Mar, 2007 10 commits

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

unknown authored Mar 02, 2007

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


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

3b53ec82

ndb - bug#15632 · 039a5f41

unknown authored Mar 02, 2007

  arg...also fix starting node...(version 6)



storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  arg...also fix starting node...

039a5f41

ndb - bug#15632 · ee3fde4e

unknown authored Mar 02, 2007

  fix testNodeRestart -n Bug15632
  handle version > 5


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix testNodeRestart -n Bug15632
  handle version > 5

ee3fde4e

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

unknown authored Mar 02, 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/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

6ad7d664

ndb - · 3fcc6915

unknown authored Mar 02, 2007

  fix printout
  crashes testSystemRestart -n SR_UNDO


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix printout
  crashes testSystemRestart -n SR_UNDO

3fcc6915

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · be3d4002
unknown authored Mar 02, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work


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

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 6b2e1485

unknown authored Mar 02, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

6b2e1485

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca · af0554d1

unknown authored Mar 02, 2007

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

af0554d1

Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes · 87c5e84f
unknown authored Mar 02, 2007
```
(part 1)
- add signal data
- add ref in dict on create/drop table/index
```
87c5e84f
Bug #26720 Infinite loop on unknown signal in logging function · 1301de42
unknown authored Mar 02, 2007
```
- terminate printing
```
1301de42

01 Mar, 2007 5 commits

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 9a68e407
unknown authored Mar 01, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
9a68e407
Bug #26741 ndb_restore with only print_data seg faults · d080df77
unknown authored Mar 01, 2007
```
- only creat systable if conencted to ndb
```
d080df77

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 7f20fe50

unknown authored Mar 01, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

7f20fe50

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca · 23c33249

unknown authored Mar 01, 2007

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

23c33249

ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer · f9bfa780

unknown authored Mar 01, 2007

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)

f9bfa780

26 Feb, 2007 3 commits

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 1c64c0fa

unknown authored Feb 26, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.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.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

1c64c0fa

corrected manual merge · 7c1572de
unknown authored Feb 26, 2007

7c1572de

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca · 0b60b1d3

unknown authored Feb 26, 2007

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

0b60b1d3

25 Feb, 2007 1 commit

mi_open.c: · ca0cb9e6

unknown authored Feb 26, 2007

  #if => #ifdef


storage/myisam/mi_open.c:
  #if => #ifdef

ca0cb9e6

23 Feb, 2007 1 commit
- ndb - 5.1.16 uint64 align for ndb_restore · 5c659040
  unknown authored Feb 23, 2007
```
storage/ndb/tools/restore/Restore.cpp:
  uint64 align patch
```
  5c659040
22 Feb, 2007 9 commits
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 125d74e1
  unknown authored Feb 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  125d74e1
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · aa798f63
  unknown authored Feb 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
```
  aa798f63
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4c3a363b
  unknown authored Feb 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  4c3a363b
- ndb - bug#26481 - fix of bug fix 5.0 version · b5b3c616
  unknown authored Feb 22, 2007
  
  b5b3c616
- Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb · 17519176
  unknown authored Feb 22, 2007
```
into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-rel
```
  17519176
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 01a55040
  unknown authored Feb 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  01a55040
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 7cbef98e
  unknown authored Feb 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
```
  7cbef98e
- ndb - bug#26481 - fix of bug fix · dc4d8ec6
  unknown authored Feb 22, 2007
```
  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
```
  dc4d8ec6
- ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer · 4e775fcd
  unknown authored Feb 22, 2007
  
  4e775fcd
21 Feb, 2007 10 commits

Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 985c1d79
unknown authored Feb 22, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
985c1d79

mi_open.c: · 0943e98e

unknown authored Feb 21, 2007

  Can only use mi_dynmap_file() if HAVE_MMAP is defined


storage/myisam/mi_open.c:
  Can only use mi_dynmap_file() if HAVE_MMAP is defined

0943e98e

base64-t.c: · f6878900

unknown authored Feb 21, 2007

  Calculate and output line count first to be
  compatible with older versions of Test::Harness


unittest/mysys/base64-t.c:
  Calculate and output line count first to be
  compatible with older versions of Test::Harness

f6878900

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

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