Commits · f8117051f98b882621aa49e09b46c715eda38e02 · nexedi / MariaDB

30 May, 2007 5 commits

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

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

f8117051

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

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

7bb7dea9

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

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

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

fd0cc51c

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

afac7ead

29 May, 2007 9 commits

shorten some files for tar to work · a14059db

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

a14059db

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

ff0479e3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 92bea0c3
unknown authored May 29, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
```
92bea0c3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 07fcd267
unknown authored May 29, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
07fcd267

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

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

840dfc39

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

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

4efc39f9

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

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

34cbf35e

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

unknown authored May 29, 2007

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


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

f75c300a

ndb - fix typo · bfc82a63
unknown authored May 29, 2007

bfc82a63

28 May, 2007 20 commits

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

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

269785bd

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

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

027b64f8

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

07524c35

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

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

0515ea59

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


ndb/test/include/NdbRestarter.hpp:
  Auto merged
```
9bbf2f7c
make memeber public · f4c75aef
unknown authored May 28, 2007

f4c75aef

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

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

69f750c3

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

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

7cbf613d

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

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

ac146e31

bug#28717, make sure only master updates activeStatus · 547b5112

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

547b5112

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

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

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

c9d6ad13

Bug #28719: multi pk update ignore corrupts data · b1a5f427

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

b1a5f427

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

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

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

47dc880c

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

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

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

7ce0c9f1

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

25 May, 2007 2 commits

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

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

8a713653

Bug #28525 Node failures in PGMAN at ndbrequire (line 430) · babe38a4

unknown authored May 25, 2007


storage/ndb/src/kernel/blocks/pgman.cpp:
  Under heavy insert PGMAN can run out of page entries
  even when set to 100 times page cache entries.
  
  In this use pattern the extra entries remain idle
  on LIRS stack.  Only ONSTACK is set.  There is not
  enough activity to free them the normal way.
  
  A study of PGMAN / DBTUP behaviour is needed.
  
  This patch adds new sublist SL_IDLE.  When page entry
  pool is empty, an idle entry is released from SL_IDLE
  front if there is any.  Otherwise, we still crash.
  
  The factor above is set from 100 to 10 (still high).
storage/ndb/src/kernel/blocks/pgman.hpp:
  Under heavy insert PGMAN can run out of page entries
  even when set to 100 times page cache entries.
  
  In this use pattern the extra entries remain idle
  on LIRS stack.  Only ONSTACK is set.  There is not
  enough activity to free them the normal way.
  
  A study of PGMAN / DBTUP behaviour is needed.
  
  This patch adds new sublist SL_IDLE.  When page entry
  pool is empty, an idle entry is released from SL_IDLE
  front if there is any.  Otherwise, we still crash.
  
  The factor above is set from 100 to 10 (still high).

babe38a4

24 May, 2007 4 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · ff1a3d3f
unknown authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
ff1a3d3f

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

unknown authored May 24, 2007

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


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

af4aac81

Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · 9202b48b
unknown authored May 24, 2007
```
- correction, use recomputed _actual_ redobuffer
```
9202b48b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 98a46edb
unknown authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
98a46edb