Commits · 50b0fd881eed8a7c1fa7f6481e39540f665f8507 · nexedi / MariaDB

22 Apr, 2006 2 commits
- WL 2826: Error handling of ALTER TABLE for partitioning · 50b0fd88
  unknown authored Apr 22, 2006
```
Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue
```
  50b0fd88
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 329de196
  unknown authored Apr 21, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
```
  329de196
21 Apr, 2006 33 commits

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c63899bd

unknown authored Apr 21, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

c63899bd

Delete some more NDB cruft. · 9017d5ec

unknown authored Apr 21, 2006


BitKeeper/deleted/.del-Linuxmkisofs~c3340108ee428bfd:
  Delete: storage/ndb/home/bin/Linuxmkisofs
BitKeeper/deleted/.del-Solarismkisofs~f2352aa3eb74bf81:
  Delete: storage/ndb/home/bin/Solarismkisofs
BitKeeper/deleted/.del-cvs2cl.pl~f6dd53614cca3bd7:
  Delete: storage/ndb/home/bin/cvs2cl.pl
BitKeeper/deleted/.del-fix-cvs-root~85b114dffe4dcd71:
  Delete: storage/ndb/home/bin/fix-cvs-root
BitKeeper/deleted/.del-import-from-bk.sh~fd7b3609d1cb93cc:
  Delete: storage/ndb/home/bin/import-from-bk.sh
BitKeeper/deleted/.del-ndb_deploy~1d70ed639d03fc07:
  Delete: storage/ndb/home/bin/ndb_deploy
BitKeeper/deleted/.del-funcs.sh~19e11fb1f65b19e1:
  Delete: storage/ndb/home/lib/funcs.sh
BitKeeper/deleted/.del-ndbdoxy.pl~cc153c886e5d1085:
  Delete: storage/ndb/home/bin/ndbdoxy.pl
BitKeeper/deleted/.del-ngcalc~9f8fb4a518060935:
  Delete: storage/ndb/home/bin/ngcalc
BitKeeper/deleted/.del-parseConfigFile.awk~17f70292f412959a:
  Delete: storage/ndb/home/bin/parseConfigFile.awk
BitKeeper/deleted/.del-setup-test.sh~57acbf006ee61516:
  Delete: storage/ndb/home/bin/setup-test.sh
BitKeeper/deleted/.del-signallog2html.sh~11f078f3616cece4:
  Delete: storage/ndb/home/bin/signallog2html.sh
BitKeeper/deleted/.del-signallog2list.awk~9e3c7272618f8a3e:
  Delete: storage/ndb/home/bin/signallog2html.lib/signallog2list.awk
BitKeeper/deleted/.del-stripcr~87d0d3d45e5dcf97:
  Delete: storage/ndb/home/bin/stripcr
BitKeeper/deleted/.del-uniq_blocks.awk~c98f28fca67bec81:
  Delete: storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk

9017d5ec

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f9ba26af
unknown authored Apr 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
f9ba26af
ndb: minor modification in replication timer code · a9047d3a
unknown authored Apr 21, 2006
```
added missing setting of latest applied epoch
```
a9047d3a

disabled.def cleanup · b91173ca

unknown authored Apr 21, 2006


storage/ndb/test/ndbapi/bank/Bank.cpp:
  added skip create option to bank test program

b91173ca

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 975457b0
unknown authored Apr 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
975457b0

Merge jonas@perch:src/51-work/ · 85dac923

unknown authored Apr 21, 2006

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


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

85dac923

added skip create option to bank test program · d4a82db9
unknown authored Apr 21, 2006

d4a82db9
Bug #19255 ndb: restore of ndb backup from different endian does not work · 6e973a1b
unknown authored Apr 21, 2006
```
+ removed not needed --


mysql-test/mysql-test-run.pl:
  post merge fix
```
6e973a1b

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ddf50f7c

unknown authored Apr 21, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/partition_info.h:
  Auto merged

ddf50f7c

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d73562fb

unknown authored Apr 21, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

d73562fb

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dccbc644
unknown authored Apr 21, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
dccbc644
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1a6219fd
unknown authored Apr 21, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
```
1a6219fd
BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ... · 5912fe26
unknown authored Apr 21, 2006
```
Review fixes


sql/partition_info.cc:
  Review fixes
sql/partition_info.h:
  Review fixes
```
5912fe26
WL 2826: Error handling of ALTER TABLE for partitioning · 1f522ccd
unknown authored Apr 21, 2006
```
Final review fixes


sql/mysql_priv.h:
  Final review fixes
sql/sql_table.cc:
  Final review fixes
```
1f522ccd

ndb - · 999c1870

unknown authored Apr 21, 2006

  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

999c1870

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 8e75c827

unknown authored Apr 21, 2006

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

8e75c827

ndb - · 9da4701f

unknown authored Apr 21, 2006

  Fix error handling when out of diskspace


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix error handling when out of diskspace

9da4701f

Bug #17230 Can't change character-sets-dir for ndbd · 7041c694
unknown authored Apr 21, 2006

7041c694

ndb: corrected install dir · 524f6b3b

unknown authored Apr 21, 2006

    ndb: corrected initialization of records


mysql-test/Makefile.am:
  ndb: corrected install dir
sql/ha_ndbcluster.cc:
  ndb: corrected initialization of records

524f6b3b

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bafc8051
unknown authored Apr 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
bafc8051
Merge jonas@perch:src/51-work/ · 509eea1f
unknown authored Apr 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
509eea1f

bug#18594 ndb_restore log boken in 5.1 · 77799f8e

unknown authored Apr 21, 2006

- corrected previous patch
- read log entry variables out into explicit variables for siimpler code (and backwards compatability code)

77799f8e

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 · 0d1e6990

unknown authored Apr 21, 2006

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

0d1e6990

Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...) · 829739b3
unknown authored Apr 21, 2006

829739b3
added one more missing install path for new files · c64dbda9
unknown authored Apr 21, 2006

c64dbda9

ndb - bug#19245 · 7477b4fa

unknown authored Apr 21, 2006

  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

7477b4fa

added missing install paths for new files · 90eba7b6
unknown authored Apr 21, 2006

90eba7b6

ndb - · f6955e32

unknown authored Apr 21, 2006

  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

f6955e32

ndb - · f3e2fbb1

unknown authored Apr 21, 2006

  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!

f3e2fbb1

added missing files · 69e5b3e5

unknown authored Apr 21, 2006


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''

69e5b3e5

added missing files · 92f15a3a
unknown authored Apr 21, 2006

92f15a3a

Merge rurik.mysql.com:/home/igor/tmp_merge · f0a6d276

unknown authored Apr 20, 2006

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

f0a6d276

20 Apr, 2006 5 commits

diabled failing tests again · 19e979f4
unknown authored Apr 21, 2006

19e979f4

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0ebc0382

unknown authored Apr 21, 2006

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


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

0ebc0382

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 8b810fba
unknown authored Apr 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
8b810fba

Bug#18594 ndb_restore log boken in 5.1 · e9347de8

unknown authored Apr 21, 2006

- 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''

e9347de8

Merge rurik.mysql.com:/home/igor/tmp_merge · 2c184511
unknown authored Apr 20, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
```
2c184511