Commits · 91fb0fff236ced73e7e7a4ca501f6c8458efe6d8 · nexedi / MariaDB

12 Feb, 2007 1 commit
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 91fb0fff
  unknown authored Feb 12, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  91fb0fff
09 Feb, 2007 10 commits

Enabled engine_condition_pushdown (on) as default · 826b393d
unknown authored Feb 09, 2007

826b393d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 1c6d127a
unknown authored Feb 09, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
1c6d127a

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 17af7c07

unknown authored Feb 09, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


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

17af7c07

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · f3e1ecc7

unknown authored Feb 09, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


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

f3e1ecc7

bug #26225 Engine condition pushdown doesn't work with prepare statements... · 67cd2789

unknown authored Feb 09, 2007

bug #26225  Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly

67cd2789

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

unknown authored Feb 09, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge
storage/ndb/src/common/debugger/EventLogger.cpp:
  masnual merge

ad933942

BUG#22025 Return correct error message when transporter error occur. · ed581deb
unknown authored Feb 09, 2007
```
ndb/src/common/debugger/EventLogger.cpp:
  Add correct error string when transporter error occur.
```
ed581deb
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 697eaf4a
unknown authored Feb 09, 2007
```
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
```
697eaf4a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · b1a6515c
unknown authored Feb 09, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
```
b1a6515c
Merge trift2.:/MySQL/M51/mysql-5.1 · 74f27a82
unknown authored Feb 09, 2007
```
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
```
74f27a82

08 Feb, 2007 2 commits

updates caused by 5.1.16 · a72cc9bd

unknown authored Feb 08, 2007


BitKeeper/etc/ignore:
  Added mysql-test/partitions.log mysql-test/rpl.log to the ignore list

a72cc9bd

Bug #24000 ndb_config.cpp has the wrong name ndb_condig.cpp in source distro · d3201363
unknown authored Feb 08, 2007
```
storage/ndb/tools/ndb_config.cpp:
  Rename: storage/ndb/tools/ndb_condig.cpp -> storage/ndb/tools/ndb_config.cpp
```
d3201363

07 Feb, 2007 15 commits

ndb: correction of "ignore error" patch · 10db7275
unknown authored Feb 08, 2007

10db7275
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 485f35eb
unknown authored Feb 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
485f35eb
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · f48a7ad2
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
f48a7ad2

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · de1eced0

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

de1eced0

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 1242807e
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
1242807e

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · bbbd87cf

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

bbbd87cf

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 9ae03424

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  SCCS merged

9ae03424

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

NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: · 9656559a

unknown authored Feb 07, 2007

bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
Removed stray mthod declaration

sql/ha_ndbcluster.h:
Removed stray mthod declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ndb/src/ndbapi/NdbScanOperation.cpp:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
sql/ha_ndbcluster.cc:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound

9656559a

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · ea48fec4
unknown authored Feb 07, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
ea48fec4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 9fa11535
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
9fa11535
bug#25821 Excessive partition pruning for multi-range index scan in NDB API:... · 7709f3b8
unknown authored Feb 07, 2007
```
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case
```
7709f3b8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · a3cc5dc5
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
a3cc5dc5

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7042b524

unknown authored Feb 07, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged

7042b524

bug#25821 Excessive partition pruning for multi-range index scan in NDB API:... · 44e8a0f0
unknown authored Feb 07, 2007
```
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value
```
44e8a0f0

06 Feb, 2007 12 commits

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 3b64cbb6

unknown authored Feb 06, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

3b64cbb6

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · b7b6961f

unknown authored Feb 06, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged

b7b6961f

Fix for bug#25821 Excessive partition pruning for multi-range index scan in... · 8e60d0b0

unknown authored Feb 06, 2007

Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

8e60d0b0

Excluded wrongly merged changeset. · df95907a
unknown authored Feb 07, 2007

df95907a

Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy · 50594204

unknown authored Feb 06, 2007

- Add variable "ndbcluster_binlog_terminating" and use that to signal
the cluster binlog thread it's time to shutdown. This allows
exact control of when the thread shutdown, previous implementation 
would start shutdown of the thread as soon as the mysqld started
shutdown. Now we will shutdown cluster binlog thread 
in 'ndbcluster_binlog_end'


sql/ha_ndbcluster_binlog.cc:
  Make binlog thread shutdown controllable by using a separet variable
  to communicate the order to shutdown

50594204

copy from test-extra-5.1 to main tree · 929de1ed

unknown authored Feb 06, 2007

BitKeeper/etc/ignore:
Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
inserted newline at the end of file.
mysql-test/suite/objects/include/drop_all.inc:
inserted newline at the end of file.
mysql-test/suite/partitions/include/partition_key_32col.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/data/rpl_mixed.dat:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
inserted newline at the end of file.

929de1ed

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga · a4251002

unknown authored Feb 06, 2007

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


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

a4251002

ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected · 03eb68ac
unknown authored Feb 06, 2007

03eb68ac
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 87ca5918
unknown authored Feb 06, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
87ca5918

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga · 4161120f

unknown authored Feb 06, 2007

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


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge

4161120f

Bug #26021 - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read · 9e77bdc9

unknown authored Feb 06, 2007


sql/ha_ndbcluster.cc:
  Bug #26021: make sure ndbcluster_create_event_ops even if no binlogging as flags NSF_NO_BINLOG is set there
  set NSS_DROPPED state in handle_trailing_share if appropriate
  added dbug printout and comments for NDB_SHARE references
sql/ha_ndbcluster_binlog.cc:
  Bug #26021: set NSF_NO_BINLOG if !ndb_binlog_running
  Bug #26021: only reuse share if share_may_exist
  setup apply_status table to be logged always, even if no binlogging
  added dbug printout and comments for NDB_SHARE references

9e77bdc9

ndb: remove WAITFOR_RESPONSE_TIMEOUT printout · 75df29e0

unknown authored Feb 06, 2007

- to get cleaner error log in debug mode


storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove WAITFOR_RESPONSE_TIMEOUT printout

75df29e0