Commits · 15c3ecdc8f1361e11f2c78d508afa3bc2bd15db9 · nexedi / MariaDB

03 Jun, 2007 2 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 15c3ecdc

unknown authored Jun 03, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

15c3ecdc

Bug#20612. · 1b5c8df7

unknown authored Jun 03, 2007


storage/ndb/src/kernel/blocks/pgman.cpp:
  a) in one case pl_queue.remove(ptr) was not followed
  by state &= ~ Page_entry::ONQUEUE.
  
  b) when collecting initial hot entries have to remove
  from queue if somehow got there.
  
  b) is easy to get with large buffer cache (256M).
  a) or b) is probably cause of bug#20612.

1b5c8df7

30 May, 2007 8 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 76fbc41d

unknown authored May 30, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  manual merge

76fbc41d

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 7cfc8605

unknown authored May 30, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  manual merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge

7cfc8605

Bug #28443 · 53eb72df
unknown authored May 30, 2007
```
- correction of merge error
```
53eb72df

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · f86e47bf

unknown authored May 30, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp:
  Auto merged

f86e47bf

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 41ac5df4

unknown authored May 30, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


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

41ac5df4

Bug #28770 file already opened error when corrupt schema file · a5d6866f
unknown authored May 30, 2007
```
- make sure we close the first file, before opening the next
```
a5d6866f

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · ef4d859d

unknown authored May 30, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  manual merge

ef4d859d

Bug #28749 MaxNoOfOpenFiles offset by 1 · b0f94aa7
unknown authored May 30, 2007

b0f94aa7

29 May, 2007 9 commits

shorten some files for tar to work · bb82fa3b

unknown authored May 29, 2007

storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp:
Rename: storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp:
Rename: storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp -> storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp:
Rename: storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp

bb82fa3b

Bug #26783 replication status unknown after cluster or mysqld failure · f440521c
unknown authored May 29, 2007

f440521c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 6a8a7f7d
unknown authored May 29, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
```
6a8a7f7d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 6b848a30
unknown authored May 29, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
6b848a30

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

unknown authored May 29, 2007

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

6885c18b

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 7eb2b153

unknown authored May 29, 2007

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

7eb2b153

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

unknown authored May 29, 2007

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


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

71048258

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

unknown authored May 29, 2007

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


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

f863fc2a

ndb - fix typo · 497d0e58
unknown authored May 29, 2007

497d0e58

28 May, 2007 20 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · da96f1cf

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged

da96f1cf

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · cc38332a

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  manual merge

cc38332a

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · fb062d57
unknown authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
fb062d57
print user and system time at watchdog check · 0544f941
unknown authored May 28, 2007

0544f941

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 0718a88c

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  null merge
storage/ndb/test/include/NdbRestarter.hpp:
  null merge

0718a88c

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · fb8c55d7
unknown authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/include/NdbRestarter.hpp:
  Auto merged
```
fb8c55d7
make memeber public · 36fede40
unknown authored May 28, 2007

36fede40

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · ce578227

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge

ce578227

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · ea4fb7d3

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge

ea4fb7d3

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 1fa79d3d

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge
ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge

1fa79d3d

bug#28717, make sure only master updates activeStatus · 70da85ee

unknown authored May 28, 2007

  so that othernodes dont get confused after having recevied status from master
  and then tries to update it self


ndb/src/kernel/blocks/ERROR_codes.txt:
  error 1001, delay node_failrep
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  error 1001, delay node_failrep
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

70da85ee

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 4b41ba2b
unknown authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
4b41ba2b
Bug #28719: multi pk update ignore corrupts data · ee44156d
unknown authored May 28, 2007
```
- 5.1 adoption
```
ee44156d

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e715b909

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge

e715b909

Bug #28719: multi pk update ignore corrupts data · 8cf669f3

unknown authored May 28, 2007

- check multi update as well as update
- this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs


mysql-test/r/ndb_basic.result:
  Bug #28719: multi pk update ignore corrupts data
  - add test + backport some tests from 5.1
mysql-test/t/ndb_basic.test:
  Bug #28719: multi pk update ignore corrupts data
  - add test + backport some tests from 5.1

8cf669f3

Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · 3bfdda06
unknown authored May 28, 2007
```
- correction, backport to 5.0
```
3bfdda06

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 5e5bcc0d

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

5e5bcc0d

Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · 1254090d
unknown authored May 28, 2007
```
- correction, backport to 5.0
```
1254090d

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · ee12b8f4

unknown authored May 28, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

ee12b8f4

Bug #28525 Node failures in PGMAN at ndbrequire (line 430) · 18dc4457
unknown authored May 28, 2007
```
(part 2)
```
18dc4457

25 May, 2007 1 commit

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · e33600bc

unknown authored May 25, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

e33600bc