Commits · 61587c18639f4dfeb4e30e490c8b7785341c1eb5 · nexedi / MariaDB

21 Feb, 2007 11 commits

Merge trift2.:/MySQL/M51/mysql-5.1 · 61587c18
unknown authored Feb 21, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/mysqld.cc:
  Auto merged
```
61587c18

Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 680ae98b

unknown authored Feb 21, 2007

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged

680ae98b

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb · 7e94b4fc
unknown authored Feb 21, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1
```
7e94b4fc

archive_reader.c: · dfaa2564

unknown authored Feb 21, 2007

  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol


storage/archive/archive_reader.c:
  Added include of m_string.h, to find 64 bit mapping of strtoll to strtol

dfaa2564

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb · 23f4479d
unknown authored Feb 21, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1
```
23f4479d
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 437126a5
unknown authored Feb 21, 2007
```
into  trift2.:/MySQL/M51/merge-5.1


configure.in:
  Auto merged
```
437126a5

Merge trift2.:/MySQL/M50/merge-5.0 · ee351622

unknown authored Feb 21, 2007

into  trift2.:/MySQL/M51/merge-5.1


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  Null-merge: 5.0 version number upgrade only, irrelevant for 5.1

ee351622

Merge... · 7c7dbce2

unknown authored Feb 21, 2007

Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb

7c7dbce2

fix c++ syntac in c file · 51a60123
unknown authored Feb 21, 2007

51a60123
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a0933646
unknown authored Feb 21, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
a0933646

Bug #26490 duplicate cluster error code · fe89684a

unknown authored Feb 21, 2007

- fixed error code
- added test program run in mysql-test-run bk version


mysql-test/ndb/ndbcluster.sh:
  Bug #26490 duplicate cluster error code
  - added check for duplicate error in mysql-test run
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  Bug #26490 duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/Makefile.am:
  Bug #26490 duplicate cluster error code
  - added test program for duplicate error messages
storage/ndb/src/ndbapi/ndberror.c:
  Bug #26490 duplicate cluster error code
  - fixed error code
storage/ndb/src/ndbapi/ndberror_check.c:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndberror_check.c''

fe89684a

20 Feb, 2007 13 commits

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7fa41312
unknown authored Feb 20, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1


configure.in:
  Auto merged
```
7fa41312
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 40979684
unknown authored Feb 20, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1


configure.in:
  nullmerge
```
40979684
Raise version number after cloning 5.1.16-beta · 982d2a66
unknown authored Feb 20, 2007

982d2a66

Merge trift2.:/MySQL/M41/merge-4.1 · 76e2b3e5

unknown authored Feb 20, 2007

into  trift2.:/MySQL/M50/merge-5.0


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

76e2b3e5

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · c5beed03
unknown authored Feb 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-engines
```
c5beed03
Raise version number after cloning 5.0.36 · da39e1d8
unknown authored Feb 20, 2007

da39e1d8

After-merge fix: · cf933534

unknown authored Feb 20, 2007

The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".


mysys/thr_alarm.c:
  After-merge fix:
  In 4.1, the variable "thr_client_alarm" is declared in this module.

cf933534

Merge trift2.:/MySQL/M40/clone-4.0 · 4a347272

unknown authored Feb 20, 2007

into  trift2.:/MySQL/M41/merge-4.1


include/config-win.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Not applicable to 4.1 in its current state.
sql/mysqld.cc:
  Change was a backport already, null-merged to 4.1.

4a347272

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · e0ef6303
unknown authored Feb 20, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysys/my_thr_init.c:
  Auto merged
```
e0ef6303
Fixed a bad merge. Got a duplicate symbol on OSX. · 446672d4
unknown authored Feb 20, 2007

446672d4

A few minor cleanups for recent AbortOption behaviour change. · 25aa87e6

unknown authored Feb 20, 2007


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Add some comments describing the new AbortOption handling.
storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp:
  Fix example to work with new AbortOption handling.
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Add forgotten method implementations.

25aa87e6

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 659d3f4e
unknown authored Feb 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
659d3f4e
Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 383ef7c8
unknown authored Feb 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
383ef7c8

19 Feb, 2007 16 commits

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

unknown authored Feb 20, 2007

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


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

41b7a60d

fix compile error in testBitfield · 65e7108f
unknown authored Feb 20, 2007

65e7108f
Merge perch.ndb.mysql.com:/home/jonas/src/50-work · c7839b7e
unknown authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
c7839b7e

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 2f7ad205

unknown authored Feb 19, 2007

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


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

2f7ad205

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

unknown authored Feb 19, 2007

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


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

70a9812d

ndb - fix correct argv/argc handling in testBitfield · 2afacafb
unknown authored Feb 19, 2007
```
ndb/test/ndbapi/testBitfield.cpp:
  fix correct argv/argc handling in testBitfield
```
2afacafb

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

unknown authored Feb 19, 2007

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


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

69718b78

ndb - · 2f58470f

unknown authored Feb 19, 2007

  forgott to add testcase for bug#26481


ndb/test/run-test/daily-basic-tests.txt:
  forgott to add testcase for bug#26481

2f58470f

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

unknown authored Feb 19, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

9ea32414

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

unknown authored Feb 19, 2007

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

cb3b2a36

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

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

unknown authored Feb 19, 2007

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

c2abf9f3

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

unknown authored Feb 19, 2007

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


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

fc13b0b8

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

unknown authored Feb 19, 2007

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

878ed654

ndb - bug#26481 · 85fdd106

unknown authored Feb 19, 2007

  fix for killed node during initial node restart


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Check cstartRecReq also when refusing GCP_SAVEREQ
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase

85fdd106

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 7b3ca5c1
unknown authored Feb 19, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
7b3ca5c1