Commits · 6f4d5b6233338247989f44cdc926eb302e88f3e2 · nexedi / MariaDB

15 Feb, 2007 3 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 6f4d5b62

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

6f4d5b62

ndb - new atrt · 73a1eba2

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

73a1eba2

ndb - · 4dbc2058

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

4dbc2058

13 Feb, 2007 4 commits

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

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 59b8906d

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

59b8906d

ndb - new atrt · 13cae745

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

13cae745

12 Feb, 2007 2 commits

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

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

4c7ce4d9

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

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

c715cca5

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