Commits · 57ae70ca4cbe4d04419aa94a751c807a606c761c · Kirill Smelkov / mariadb

18 May, 2007 4 commits

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

unknown authored May 18, 2007

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


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:
  merge

57ae70ca

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

unknown authored May 18, 2007

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


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/ndbapi/testNdbApi.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

746ee8f8

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

unknown authored May 18, 2007

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


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

051c96f2

ndb - bug#28443 · 9bfed519

unknown authored May 18, 2007

  Make sure that data can not e left lingering in receive buffer


ndb/src/common/transporter/Packer.cpp:
  test, make MAX_RECEIVED_SIGNALS an variable
ndb/src/common/transporter/TCP_Transporter.hpp:
  add new method for checking of data in receive buffer
ndb/src/common/transporter/TransporterRegistry.cpp:
  Make sure that 
  1) poll_TCP return true if any transporter has data in receiveBuffer
     (previously only if socket had data)
  2) performReceive executes signals if TCP transporter has data in receiveBuffer
     (previously only if data was recevied)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  test, make MAX_RECEIVED_SIGNALS an variable
ndb/test/ndbapi/testNdbApi.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

9bfed519

17 May, 2007 2 commits

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

unknown authored May 17, 2007

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


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

ee735892

ndb - bug#28491 · 3acd8d31

unknown authored May 17, 2007

disable "disable expand check" as it does not solve problems anyway

storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
disable "disable expand check" as it does not solve problems anyway

3acd8d31

15 May, 2007 2 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 2f90ab13
unknown authored May 15, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
2f90ab13

ndb - bug#24631 · aad9135c

unknown authored May 15, 2007

  add Dbdict::restartDropObj*


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add restartDropObj
  - handle undo files "specially"
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  add restartDropObj*
storage/ndb/src/kernel/blocks/lgman.cpp:
  allow drop of meta files
storage/ndb/src/kernel/blocks/tsman.cpp:
  allow drop of meta files
storage/ndb/test/ndbapi/testDict.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase

aad9135c

14 May, 2007 11 commits

corrected manual merge · cb238b0e
unknown authored May 14, 2007

cb238b0e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · fb3e1fde
unknown authored May 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
fb3e1fde
disable test if log bin is not turned on · 9f18586c
unknown authored May 14, 2007

9f18586c

files to check if log bin is turned on · c78f4340

unknown authored May 14, 2007


mysql-test/include/have_log_bin.inc:
  New BitKeeper file ``mysql-test/include/have_log_bin.inc''
mysql-test/r/have_log_bin.require:
  New BitKeeper file ``mysql-test/r/have_log_bin.require''

c78f4340

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

unknown authored May 14, 2007

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


sql/ha_ndbcluster.cc:
  manual merge

7372d0fa

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 3425d7d6
unknown authored May 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
3425d7d6
Bug #28410 ndb: no retry sleep when getting autoincrement · 5a5aafd3
unknown authored May 14, 2007
```
- add retry sleep to allow temprary error to go away
```
5a5aafd3

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

unknown authored May 14, 2007

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


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged

5c419ee2

ndb - bug#28348 · 6962973e

unknown authored May 14, 2007

  remove LCP files when dropping table


storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  add tup as user (for fsremove)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  remove each LCP file regardless if present or not

6962973e

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 9bcdaea2
unknown authored May 14, 2007
```
into  dator3.(none):/home/mikael/mysql_clones/rt-5.0
```
9bcdaea2
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · db350aa1
unknown authored May 14, 2007
```
into  dator3.(none):/home/mikael/mysql_clones/rt-5.1
```
db350aa1

11 May, 2007 3 commits
- Bug#25818 No return of NDB share object in failures in open method · 48a3175c
  unknown authored May 11, 2007
```
- correct manual/auto merge to 5.1
```
  48a3175c
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 888ffb66
  unknown authored May 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  manual merge
```
  888ffb66
- Bug#25818 No return of NDB share object in failures in open method · 18e6090c
  unknown authored May 11, 2007
```
- make sure resources are release properly on error
```
  18e6090c
10 May, 2007 7 commits

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

unknown authored May 10, 2007

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

4d7824e3

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 28d9a827

unknown authored May 10, 2007

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


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

28d9a827

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 8b82a5ab
unknown authored May 10, 2007
```
into  dator3.(none):/home/mikael/mysql_clones/rt-5.0
```
8b82a5ab
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 1984babb
unknown authored May 10, 2007
```
into  dator3.(none):/home/mikael/mysql_clones/rt-5.1
```
1984babb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 47430268
unknown authored May 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
47430268

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt · 8d8a3205

unknown authored May 10, 2007

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/handler.cc:
  manual merge
sql/mysqld.cc:
  manual merge
sql/set_var.cc:
  manual merge
sql/sql_plugin.cc:
  manual merge

8d8a3205

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt · 27ce25cd
unknown authored May 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
27ce25cd

09 May, 2007 10 commits

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · b32473a3

unknown authored May 09, 2007

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

b32473a3

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

unknown authored May 09, 2007

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


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  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/NdbRecAttr.cpp:
  manual merge

3d78e6fc

enable setting api reg req frequency to be higher than heartbeat setting to... · 198a7991

unknown authored May 09, 2007

enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
+ do this for management server

198a7991

Bug #28287 Sign problem in test "ndb_restore_print" · 7ef22d8d

unknown authored May 09, 2007

  - corrected previous patch
  - some platforms do strange things with char... use Int8 to be sure of signedness

7ef22d8d

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · 80a36692

unknown authored May 09, 2007

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged

80a36692

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

unknown authored May 09, 2007

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


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged

495c6fce

Bug #27292 restarting a data node makes sql nodes log event buffer status every few seconds · a3b65091
unknown authored May 09, 2007

a3b65091

loaddata.result, loaddata.test: · ba9657bc

unknown authored May 09, 2007

  A test case is corrected.


mysql-test/t/loaddata.test:
  A test case is corrected.
mysql-test/r/loaddata.result:
  A test case is corrected.

ba9657bc

Bug #28287 Sign problem in test "ndb_restore_print" · 643cb9b8
unknown authored May 09, 2007
```
- some platforms do strange things with char... use Int8 to be sure of signedness
```
643cb9b8

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 0ba14149

unknown authored May 08, 2007

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

0ba14149

08 May, 2007 1 commit
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c863f1ee
  unknown authored May 09, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27670-bug-5.0-opt-mysql
```
  c863f1ee