Commits · 21c2e6e11af1ec2cd69d0064bf8c228c81075378 · nexedi / MariaDB

12 Feb, 2007 2 commits

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

unknown authored Feb 12, 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

21c2e6e1

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5abe2fdb

unknown authored Feb 12, 2007

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


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

5abe2fdb

09 Feb, 2007 10 commits

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

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


sql/ha_ndbcluster.cc:
  Auto merged
```
a10fa148

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

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

205b9cbf

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

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

4de01438

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

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

ef60c96f

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

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

f9616d92

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


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


BitKeeper/etc/ignore:
  auto-union
```
8bdc141f
Merge trift2.:/MySQL/M51/mysql-5.1 · 135d0256
unknown authored Feb 09, 2007
```
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
```
135d0256

08 Feb, 2007 2 commits

updates caused by 5.1.16 · fc71108a

unknown authored Feb 08, 2007


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

fc71108a

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

07 Feb, 2007 15 commits

ndb: correction of "ignore error" patch · 479ad12a
unknown authored Feb 08, 2007

479ad12a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1daa0e44
unknown authored Feb 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


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

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

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

7d678ab9

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

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

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

e7c4bc62

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

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

0690e39b

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

NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: · c8f470ea

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

c8f470ea

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · f1882c1f
unknown authored Feb 07, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
f1882c1f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 5d00f961
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
5d00f961
bug#25821 Excessive partition pruning for multi-range index scan in NDB API:... · 310d70a3
unknown authored Feb 07, 2007
```
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case
```
310d70a3
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 6e393bdb
unknown authored Feb 07, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
6e393bdb

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

unknown authored Feb 07, 2007

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


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

17f82aa3

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

06 Feb, 2007 11 commits

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

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

cef338ec

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

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

fd2c17db

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

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

ba8a684d

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

efc2771d

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

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

b2f415d3

copy from test-extra-5.1 to main tree · ee5eb8bb

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.

ee5eb8bb

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

unknown authored Feb 06, 2007

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


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

bc365a8b

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

87684824
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 95edb7dd
unknown authored Feb 06, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
95edb7dd

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

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

b0570148

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

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

df3494ca