Commit graph

35808 commits

Author SHA1 Message Date
unknown
39e48fb293 Merge dator5.(none):/home/pappa/bug20767
into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
2006-07-15 03:41:41 -04:00
unknown
dd72905716 BUG#20389: Crash when using index scan in reverse order
mysql-test/r/partition_order.result:
  Changed a test case to handle ordered index scan reverse order as well
mysql-test/t/partition_order.test:
  Changed a test case to handle ordered index scan reverse order as well
sql/ha_myisam.cc:
  More debug info
sql/ha_partition.cc:
  Introduced partition_index_read_last to ensure we use index_read_last in those
  cases towards underlying handler.
  Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
  HA_READ_BEFORE_KEY uses ordered index scan in reverse order.
sql/ha_partition.h:
  Introduced partition_index_read_last to ensure we use index_read_last in those
  cases towards underlying handler.
  Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
  HA_READ_BEFORE_KEY uses ordered index scan in reverse order.
2006-07-15 03:38:34 -04:00
unknown
907df8e3c8 BUG#20893: Valgrind error
mysql-test/r/partition_mgm.result:
  Added new test case
mysql-test/t/partition_mgm.test:
  Added new test case
sql/ha_partition.cc:
  Fixed memory overwrite, added new variable for memory check
  Problem was when reorganising partitions, the file handles
  got in the wrong place.
sql/ha_partition.h:
  Added new variable for debugging mostly
2006-07-10 17:08:42 -04:00
unknown
16c54768ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-07 02:18:02 +04:00
unknown
9d332ef794 removed alter table partition error test since it cannot be made predictable... name will change of created file 2006-07-07 00:18:01 +02:00
unknown
c21a6eda3d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 21:30:55 +02:00
unknown
d2b4e9c8e2 Merge bodhi.netgear:/opt/local/work/mysql-5.1-root
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
2006-07-06 22:26:47 +04:00
unknown
925fba7a03 Bug #20820 auto inc table not handled correctly when restored from cluster backup
mysql-test/t/ndb_dd_backuprestore.test:
  make sure only run in default cluster
mysql-test/t/rpl_ndb_dd_advance.test:
  make sure only run in default cluster
mysql-test/t/rpl_ndb_sync.test:
  make sure only run in default cluster
2006-07-06 20:04:48 +02:00
unknown
b78304d215 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


mysql-test/r/ndb_restore.result:
  manual merge
mysql-test/t/ndb_restore.test:
  manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
  manual merge
2006-07-06 19:02:38 +02:00
unknown
ce554d56a4 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
unknown
b8057c4af0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into trift2.:/M51/bug20216-5.1


scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2006-07-06 17:58:31 +02:00
unknown
1ceab206b9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into trift2.:/M51/merge-5.1
2006-07-06 15:52:39 +02:00
unknown
9a15154f47 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 15:52:38 +02:00
unknown
f523685c66 corrected result file
- missing order by
2006-07-06 15:51:13 +02:00
unknown
088aad5de9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
2006-07-06 15:23:23 +02:00
unknown
123c0a98b4 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
2006-07-06 15:20:22 +02:00
unknown
7997d847f2 backport of ndb DictCache fix
- don't invalidate tables that are in state RETRIEVING
2006-07-06 15:18:00 +02:00
unknown
e7340d5c62 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-07-06 12:11:14 +02:00
unknown
7d8ea6929b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 12:11:13 +02:00
unknown
086fef65ab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 10:29:00 +02:00
unknown
fc3aad740a corrected results 2006-07-06 10:20:49 +02:00
unknown
49daaae036 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged
2006-07-06 09:40:04 +02:00
unknown
0890735c7a ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
unknown
66764473a0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-06 09:08:39 +02:00
unknown
34349ad272 Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new-ndb
2006-07-06 04:37:53 +02:00
unknown
d191fb6300 ndb_dd_advance test cases
mysql-test/t/ndb_dd_advance.test:
  ndb_dd_advance.test
mysql-test/t/ndb_dd_advance2.test:
  ndb_dd_advance2.test
mysql-test/r/ndb_dd_advance.result:
  ndb_dd_advance.result
mysql-test/r/ndb_dd_advance2.result:
  ndb_dd_advance2.result
2006-07-06 04:37:03 +02:00
unknown
5a90386708 Bug #20843 tests fails randomly with assertion in completeClusterFailed
- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  reenabled test
2006-07-06 01:33:53 +02:00
unknown
e8d7da1116 .del-ndb_dd_advance.result~165b282a93715547:
Delete: mysql-test/r/ndb_dd_advance.result
.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test


BitKeeper/deleted/.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test
BitKeeper/deleted/.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
BitKeeper/deleted/.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
BitKeeper/deleted/.del-ndb_dd_advance.result~165b282a93715547:
  Delete: mysql-test/r/ndb_dd_advance.result
2006-07-05 23:50:29 +02:00
unknown
2717581764 Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
2006-07-05 23:12:49 +02:00
unknown
79a2d0521d disabled ndb_autodiscover3 again 2006-07-05 23:12:48 +02:00
unknown
066cac122d Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
mysql-test/mysql-test-run.pl:
  Auto merged
2006-07-05 21:47:09 +02:00
unknown
04b85ab689 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-05 21:47:08 +02:00
unknown
f82e49b2b6 Bug #20843 tests fails randomly with assertion in completeClusterFailed
- reenabled test as this now seems fixed
2006-07-05 21:44:11 +02:00
unknown
273be51d73 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-05 20:31:32 +02:00
unknown
623f8beec0 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
unknown
0b44f4b171 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
2006-07-05 20:23:23 +02:00
unknown
051f3892c3 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
- updated error message to more correctly reflect the issue
2006-07-05 20:20:39 +02:00
unknown
f0e2be1382 Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).
mysql-test/mysql-test-run.pl:
  Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:"
  line in its output, because otherwise we lack the information how the test suite was run.
  Add the line.
2006-07-05 20:17:04 +02:00
unknown
cc6bd3e2d7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-05 18:52:43 +02:00
unknown
f3f73f6342 added warning on cluster reconnect and binlog usage, that data may be missing 2006-07-05 18:36:18 +02:00
unknown
eab52b8a89 ndb - ndb api : try to catch autoincr 'error 0'
storage/ndb/src/ndbapi/Ndb.cpp:
  try to catch autoincr 'error 0'
2006-07-05 17:36:19 +02:00
unknown
c8cb90484c Bug #20843 tests fails randomly with assertion in completeClusterFailed 2006-07-05 17:36:18 +02:00
unknown
86da8a16f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-05 16:30:14 +02:00
unknown
95dd28cfd3 Merge mysql.com:/M50/tmp_merge_kent into mysql.com:/M51/merge-kent-5.1
scripts/make_binary_distribution.sh:
  Auto merged
2006-07-05 16:30:13 +02:00
unknown
352cd7a99c Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbApi.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndberr.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbif.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbinit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/include/HugoTransactions.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/src/HugoTransactions.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
2006-07-05 16:30:12 +02:00
unknown
53ed06f270 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
- remove some event code to get rid of some bugs
2006-07-05 16:26:08 +02:00
unknown
bd096fba85 Bug #19645 Data Node hangs in phase 100: post review fix, removed test printout 2006-07-05 15:32:17 +02:00
unknown
88783c767a Bug #19645 Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected 2006-07-05 15:04:47 +02:00
unknown
7d17a42d35 extra logging and asserts to try to track down the spurious completeCluster failure assetion
corrected error in invalidation of dict cache which may be causing the valgrind warning at times


sql/ha_ndbcluster_binlog.cc:
  extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/DictCache.cpp:
  corrected error in invalidation of dict cache which may be causing the valgrind warning at times
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  extra logging and asserts to try to track down the spurious completeCluster failure assetion
2006-07-05 14:20:14 +02:00
unknown
aad8b89a25 Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
2006-07-05 04:48:44 +02:00