Commits · 86582cbcf9ae9f5b067793b8b8cc4a1bf27b0e72 · nexedi / MariaDB

15 Feb, 2007 3 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 86582cbc

unknown authored Feb 15, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

86582cbc

ndb - new atrt · 0887c3bc

unknown authored Feb 15, 2007

    Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result


storage/ndb/test/run-test/main.cpp:
  Fix bug when restarting cluster after failure
    (fs was not cleared)
  Fix cosmetic bug that made rsync be run several times when gathering result

0887c3bc

ndb - · 9197d6b8

unknown authored Feb 15, 2007

  fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)


storage/ndb/test/src/HugoOperations.cpp:
  fix ao_ignore behavior change in hugo

9197d6b8

13 Feb, 2007 4 commits

Merge localhost:/home/jonas/src/51-work · 72d0ba1b
unknown authored Feb 13, 2007
```
into  eel.(none):/home/jonas/src/51-work
```
72d0ba1b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a3fa962b
unknown authored Feb 13, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
a3fa962b

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 5e2a3278

unknown authored Feb 13, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged

5e2a3278

ndb - new atrt · 28fd0d04

unknown authored Feb 13, 2007


BitKeeper/deleted/.del-conf-daily-basic-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-basic-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-devel-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
BitKeeper/deleted/.del-conf-daily-sql-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-sql-ndb08.txt
BitKeeper/deleted/.del-conf-daily-sql-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
BitKeeper/deleted/.del-conf-dl145a.txt:
  Delete: storage/ndb/test/run-test/conf-dl145a.txt
BitKeeper/deleted/.del-conf-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-ndbmaster.txt
BitKeeper/deleted/.del-conf-shark.txt:
  Delete: storage/ndb/test/run-test/conf-shark.txt
storage/ndb/src/cw/cpcd/Makefile.am:
  new atrt
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  new atrt
storage/ndb/test/run-test/Makefile.am:
  new atrt
storage/ndb/test/run-test/atrt-gather-result.sh:
  new atrt
storage/ndb/test/run-test/atrt.hpp:
  new atrt
storage/ndb/test/run-test/main.cpp:
  new atrt
storage/ndb/test/tools/Makefile.am:
  new atrt
storage/ndb/test/run-test/autotest-boot.sh:
  New BitKeeper file ``storage/ndb/test/run-test/autotest-boot.sh''
storage/ndb/test/run-test/autotest-run.sh:
  New BitKeeper file ``storage/ndb/test/run-test/autotest-run.sh''
storage/ndb/test/run-test/conf-dl145a.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-dl145a.cnf''
storage/ndb/test/run-test/conf-ndbmaster.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-ndbmaster.cnf''
storage/ndb/test/run-test/conf-repl.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-repl.cnf''
storage/ndb/test/run-test/example-my.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/example-my.cnf''
storage/ndb/test/run-test/files.cpp:
  New BitKeeper file ``storage/ndb/test/run-test/files.cpp''
storage/ndb/test/run-test/setup.cpp:
  New BitKeeper file ``storage/ndb/test/run-test/setup.cpp''
storage/ndb/test/run-test/test-tests.txt:
  New BitKeeper file ``storage/ndb/test/run-test/test-tests.txt''

28fd0d04

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