Commit graph

33140 commits

Author SHA1 Message Date
unknown
754f1c0e19 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
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
2006-04-26 16:07:02 +02:00
unknown
f0b7821a03 ndb - backup 4.1->5.0 merge
ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
2006-04-26 16:02:35 +02:00
unknown
8bc693a9c5 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
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
2006-04-26 15:59:44 +02:00
unknown
6087323433 ndb -
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
2006-04-26 15:57:48 +02:00
unknown
2d3209a072 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
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
2006-04-26 15:16:21 +02:00
unknown
1c74bfd85c ndb dd -
fix dirty page handling during opt.nr


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix dirty page handling during opt.nr
2006-04-26 15:15:30 +02:00
unknown
1030d5c804 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
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
2006-04-26 15:13:43 +02:00
unknown
a4e32d4e84 ndb - backport from 5.1
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)
2006-04-26 15:12:32 +02:00
unknown
4191b8a39f Add ndb_config to rpm spec 2006-04-26 14:54:20 +02:00
unknown
96b42ea0ed ndb - bug#17150
ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
  (these are used for dynamic port allocation)


ndb/include/util/SocketServer.hpp:
  Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
  Increase default max session to ~0
2006-04-26 14:53:43 +02:00
unknown
a88129e900 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-04-25 16:31:21 +02:00
unknown
460bfcc41d ndb -
Fix so that testDict can use/handle disk tables


storage/ndb/test/ndbapi/testDict.cpp:
  Fix so that testDict can use/handle disk tables
2006-04-25 16:30:44 +02:00
unknown
27ace48127 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-04-25 16:01:54 +02:00
unknown
abc0d700bb ndb - bug#18597
Handle early abort of scan, so that resources are correctly freed


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle early abort so that require on running.empty() does not fire
2006-04-25 16:01:08 +02:00
unknown
de513b1814 ndb -
1) relax version check for restore block since no changes has happend since 5.1.6
   and improve error message on check failure
   
2) improve lcp/backup max write size...


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Increase max write size to 256k (currently not configurable...)
storage/ndb/src/kernel/blocks/restore.cpp:
  Relax version check for restore block since no changes has happend since 5.1.6
storage/ndb/src/kernel/blocks/restore.hpp:
  Relax version check for restore block since no changes has happend since 5.1.6
2006-04-25 13:32:10 +02:00
unknown
3e3842fa2e ndb - bug#18780
Fix various abort cases (mainly MM but also 1 DD)
    that has been found running dbt2


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Fix abort case
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Set page dirty even if in cache
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix abort case
storage/ndb/test/ndbapi/testBasic.cpp:
  Add new testcases for various abort cases
storage/ndb/test/run-test/daily-basic-tests.txt:
  Add autotest of various abort cases
2006-04-24 09:02:46 +02:00
unknown
d030c104fa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-21 15:36:11 +02:00
unknown
c717637227 Bug #19255 ndb: restore of ndb backup from different endian does not work
+ removed not needed --


mysql-test/mysql-test-run.pl:
  post merge fix
2006-04-21 15:36:10 +02:00
unknown
bff6df9232 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2006-04-21 14:15:54 +02:00
unknown
3cd43eb425 ndb -
bug#19141, bug#18575
  
  Maek sure global dict lock is taken during create/drop file/filegroup


storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  Fix error code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix c_blockState lock for createdrop file/filegroup
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix not master for create/drop file
2006-04-21 14:13:19 +02:00
unknown
98c7825ad8 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/include/util/ndb_opts.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  manual merge
mysql-test/mysql-test-run.sh:
  manual merge
mysql-test/ndb/ndbcluster.sh:
  manual merge
2006-04-21 14:00:44 +02:00
unknown
86b74da608 ndb -
Fix error handling when out of diskspace


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix error handling when out of diskspace
2006-04-21 13:58:55 +02:00
unknown
0a22763fa6 Bug #17230 Can't change character-sets-dir for ndbd 2006-04-21 13:53:48 +02:00
unknown
f5c2191c71 ndb: corrected install dir
ndb: corrected initialization of records


mysql-test/Makefile.am:
  ndb: corrected install dir
sql/ha_ndbcluster.cc:
  ndb: corrected initialization of records
2006-04-21 13:51:58 +02:00
unknown
628e0eb305 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 11:32:25 +02:00
unknown
58f67f39c3 Merge jonas@perch:src/51-work/
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 11:29:34 +02:00
unknown
8e7d5f789a bug#18594 ndb_restore log boken in 5.1
- corrected previous patch
- read log entry variables out into explicit variables for siimpler code (and backwards compatability code)
2006-04-21 11:26:21 +02:00
unknown
925a9dcf4d added one more missing install path for new files 2006-04-21 09:43:21 +02:00
unknown
4a90a6583b ndb - bug#19245
A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
  this also likely fixes bug 18589 and explains 18808


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  remove debug printout
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that alloc bit is set if insert and first_op
storage/ndb/test/ndbapi/testBasic.cpp:
  testcase for bug#19245
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase for bug#19245
2006-04-21 09:09:33 +02:00
unknown
7aaeb9f97a added missing install paths for new files 2006-04-21 08:53:25 +02:00
unknown
3cb33e444a ndb -
fix bug#19244, dd page got locked in page cache
  likely fix bug 18780


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Fix so that insert/delete on DD does not lock page forever in memory
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Set page to dirty when aborting prealloc
2006-04-21 06:51:58 +02:00
unknown
6d8f22effe ndb -
fix memory corruption in event-api
  maybe bug fix for 18621, 19154, 19172, 19174


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
2006-04-21 06:40:47 +02:00
unknown
5389e3f94b added missing files
mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl''
mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl''
mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl''
2006-04-21 02:05:27 +02:00
unknown
cb721c50ba added missing files 2006-04-21 02:01:13 +02:00
unknown
17e3ee3553 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2


mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/opt_range.cc:
  Auto merged
2006-04-20 17:00:29 -07:00
unknown
15fca2ef57 diabled failing tests again 2006-04-21 01:59:22 +02:00
unknown
6e3263b87e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2006-04-21 01:56:15 +02:00
unknown
c1b3f8db0f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 01:53:44 +02:00
unknown
7d259218f8 Bug#18594 ndb_restore log boken in 5.1
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1


mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1.1.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''
2006-04-21 01:51:58 +02:00
unknown
f56780ecb5 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 16:51:13 -07:00
unknown
8206128210 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 16:14:17 -07:00
unknown
80edbc1d23 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-21 02:48:48 +04:00
unknown
dc3e7bdc87 fix for make distcheck 2006-04-20 23:04:55 +02:00
unknown
d9e551672d bug#19220
mi_open() should accept filename w/i extension and with .MYI
2006-04-20 23:03:13 +02:00
unknown
214fcab9e2 BUG#18594 ndb_restore log boken in 5.1
- corrected log read after fragment id addition
2006-04-20 22:04:09 +02:00
unknown
73434916f6 ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227
mysql-test/include/rpl_multi_engine3.inc:
  add some sleep for __slow__ replication
mysql-test/t/disabled.def:
  enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227
2006-04-20 18:53:23 +02:00
unknown
f9c7528ab9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-20 20:49:41 +04:00
unknown
cfe3397e38 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 07:24:34 -07:00
unknown
52b0bb6ed4 added missing cleanup in test causing later test to fail 2006-04-20 15:28:31 +02:00
unknown
383925f179 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-20 14:47:49 +02:00