Commits · 0515ea594d35edb55a585111dc49515320903ffb · Kirill Smelkov / mariadb

28 May, 2007 16 commits

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 18 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
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 80f08a6d
  unknown authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  80f08a6d
- Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 16483cde
  unknown authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
  16483cde
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 95c90170
  unknown authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1


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
```
  95c90170
- Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · bf699d71
  unknown authored May 24, 2007
```
- correction, use recomputed _actual_ redobuffer
```
  bf699d71
- Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · eaa1a23a
  unknown authored May 24, 2007
```
- parameterize on RedoBuffer
```
  eaa1a23a
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · e3a3110f
  unknown authored May 24, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  e3a3110f
- Makefile.am : Add "embedded" tests to the "test-bt" target. · 07ce35d2
  unknown authored May 24, 2007
```
Makefile.am:
  The "test-bt" target was lacking "embedded" tests -
  add them, dependent on the build of the test binary needed for them.
```
  07ce35d2
- Fix comments and option description in mysqlslap. · 2756cb62
  unknown authored May 24, 2007
  
  2756cb62
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 160d6794
  unknown authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  160d6794
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · b5e17f5d
  unknown authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/strtod.c:
  Auto merged
```
  b5e17f5d
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 06297270
  unknown authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  06297270
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · ce5d7af1
  unknown authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/strtod.c:
  Auto merged
```
  ce5d7af1
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 6df02cf7
  unknown authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/strtod.c:
  Auto merged
```
  6df02cf7
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 37f1e222
  unknown authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  37f1e222
23 May, 2007 4 commits

Merge trift2.:/MySQL/M50/push-5.0 · 7e2e5372
unknown authored May 23, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
7e2e5372

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e6cbd818

unknown authored May 23, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Auto merged

e6cbd818

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42 · 5e236f85

unknown authored May 23, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged

5e236f85

Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 7932fb54
unknown authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
7932fb54