Commits · a8138ec702cdf62d03bdeda5cee7e5e98292185b · nexedi / MariaDB

27 Apr, 2006 6 commits
- Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new · a8138ec7
  unknown authored Apr 27, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
```
  a8138ec7
- Disabled rpl_ndb_dd_partitions, new slogan · c58eade3
  unknown authored Apr 27, 2006
  
  c58eade3
- Added verification test of on-line (non-copying) alter table · 3feaf6e5
  unknown authored Apr 27, 2006
  
  3feaf6e5
- Enabled rpl_ndb_dd_partitions to see if it still fails · 08c18603
  unknown authored Apr 27, 2006
  
  08c18603
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 02594ee0
  unknown authored Apr 27, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
```
  02594ee0
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3ada0dd9
  unknown authored Apr 27, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
```
  3ada0dd9
26 Apr, 2006 34 commits

Merge mysql.com:/home/psergey/bk-trees/mysql-5.0 · 13b1f47d

unknown authored Apr 27, 2006

into  mysql.com:/home/psergey/mysql-5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

13b1f47d

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ec8be6d4
unknown authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
ec8be6d4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a98ae914
unknown authored Apr 26, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
a98ae914

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 6fe40f76

unknown authored Apr 26, 2006

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


mysql-test/r/view.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
configure.in:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge

6fe40f76

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0959264a
unknown authored Apr 26, 2006
```
into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
0959264a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 25a0e7b3
unknown authored Apr 26, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
25a0e7b3
Merge mysql.com:/home/mydev/mysql-5.1 · f94b1db4
unknown authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
f94b1db4
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · adad4df2
unknown authored Apr 26, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
adad4df2
Added test for violation of uniqueness constraint at create index · 2a89d99d
unknown authored Apr 26, 2006

2a89d99d
Corrected include path to work under Windows · 09999bc2
unknown authored Apr 26, 2006

09999bc2
Merge mysql.com:/home/mydev/mysql-5.1 · 14fd0720
unknown authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
14fd0720
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4b49959d
unknown authored Apr 26, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


mysql-test/t/disabled.def:
  Auto merged
```
4b49959d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fb0f88aa
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
fb0f88aa

Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart · 2f955d19

unknown authored Apr 26, 2006

- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error

2f955d19

Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error · 51ddd6ff
unknown authored Apr 26, 2006
```
- added retry handling of temporary transaction errors
```
51ddd6ff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c0c6461a
unknown authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
c0c6461a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a11f57a
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
1a11f57a
ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions · 2a04d49e
unknown authored Apr 26, 2006

2a04d49e
fixed error message text · 101e3703
unknown authored Apr 26, 2006

101e3703
Merge perch.ndb.mysql.com:/home/jonas/src/50-work · e1e3a93f
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
e1e3a93f
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ce6146b
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
```
2ce6146b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 9c939901
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
9c939901
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 6e905d06
unknown authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
6e905d06

ndb - backup 5.0->5.1 merge · bbe7563a

unknown authored Apr 26, 2006


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  backup 5.0->5.1 merge

bbe7563a

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

unknown authored Apr 26, 2006

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


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge

754f1c0e

ndb - backup 4.1->5.0 merge · f0b7821a
unknown authored Apr 26, 2006
```
ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
```
f0b7821a

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

unknown authored Apr 26, 2006

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


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

8bc693a9

ndb - · 60873234

unknown authored Apr 26, 2006

  Unleash backup to write more than 32k at a time
  Using parameter BackupMaxWriteSize
  (greatly affect LCP time in 5.1, set default value to 256k)


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add config fro max write size in backup
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Unleash backup to write more than 32k at a time
ndb/src/mgmsrv/ConfigInfo.cpp:
  Add config fro max write size in backup

60873234

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

unknown authored Apr 26, 2006

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

60abfb1f

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

unknown authored Apr 26, 2006

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


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

2d3209a0

ndb dd - · 1c74bfd8

unknown authored Apr 26, 2006

  fix dirty page handling during opt.nr


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix dirty page handling during opt.nr

1c74bfd8

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

unknown authored Apr 26, 2006

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


ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

1030d5c8

ndb - backport from 5.1 · a4e32d4e

unknown authored Apr 26, 2006

  Fix alignment of sockaddr(_in)


ndb/src/common/transporter/Transporter.cpp:
  Fix alignment of sockaddr(_in)
ndb/src/mgmsrv/Services.cpp:
  Fix alignment of sockaddr(_in)

a4e32d4e

Add ndb_config to rpm spec · 4191b8a3
unknown authored Apr 26, 2006

4191b8a3