Commits · 129da7bdfd8a05aa46c5bd728674d7f53bbdab9f · nexedi / MariaDB

13 Jun, 2006 1 commit

unknown authored Jun 13, 2006

  ndb_dd_advance2 test cases
ndb_dd_advance2.test:
  ndb_dd_advance test cases


mysql-test/t/ndb_dd_advance2.test:
  ndb_dd_advance test cases
mysql-test/r/ndb_dd_advance2.result:
  ndb_dd_advance2 test cases

129da7bd

12 Jun, 2006 16 commits

ndb_dd_advance test cases · 34f24c1b

unknown authored Jun 12, 2006


mysql-test/t/ndb_dd_advance2.test:
  ndb_dd_advance2 test cases
mysql-test/r/ndb_dd_advance2.result:
  ndb_dd_advance2 test cases

34f24c1b

Added order by · 53997be1
unknown authored Jun 12, 2006

53997be1

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

unknown authored Jun 12, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.1


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

abf86569

sql_delete.cc: · fe1de8ad

unknown authored Jun 12, 2006

Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
Fix of bad merge

storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Fix of bad merge
sql/ha_ndbcluster.cc:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
mysql-test/r/ndb_lock.result:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
sql/ha_ndbcluster_binlog.cc:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
mysql-test/r/rpl_ndb_basic.result:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
mysql-test/t/rpl_ndb_basic.test:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
sql/ha_ndbcluster_binlog.h:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
sql/sql_delete.cc:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog

fe1de8ad

Merge jonas@perch:src/51-jonas · beaea997

unknown authored Jun 12, 2006

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

beaea997

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · b61278dd
unknown authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
b61278dd

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

unknown authored Jun 12, 2006

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


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

b6b2da6a

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 31b08b57

unknown authored Jun 12, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

31b08b57

Bug #20336 CLUSTERLOG commands have no effect · dfe27cf5

unknown authored Jun 12, 2006

- always calculate max log level on node start
- send event subscribe uncond


ndb/src/mgmsrv/Services.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - always send log level update

dfe27cf5

Merge mysql.com:/home/marty/MySQL/mysql-5.0 · e9e26117

unknown authored Jun 12, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.1


mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
mysql-test/r/ndb_lock.result:
  Merge
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Merge
storage/ndb/src/ndbapi/ndberror.c:
  Merge

e9e26117

Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check... · f4d54623

unknown authored Jun 12, 2006

 Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

f4d54623

Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Added missing... · 36623c5b
unknown authored Jun 12, 2006
```
 Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan
```
36623c5b

Merge mysql.com:/home/marty/MySQL/mysql-4.1 · 92cfa5b5

unknown authored Jun 12, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Merge (using local)

92cfa5b5

Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes · bee43f91
unknown authored Jun 12, 2006

bee43f91
Added lock test on index scan · edb4b13c
unknown authored Jun 12, 2006

edb4b13c
Moved back comment to correct method · cb33361f
unknown authored Jun 12, 2006

cb33361f

10 Jun, 2006 1 commit
- Merge mysql.com:/home/mydev/mysql-5.1--main · 4db0d644
  unknown authored Jun 10, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  4db0d644
09 Jun, 2006 22 commits

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5618fd06
unknown authored Jun 09, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.1
```
5618fd06
Disable im_life_cycle test · f1e7179d
unknown authored Jun 10, 2006

f1e7179d
Merge rurik.mysql.com:/home/igor/mysql-5.1 · 20bb6baa
unknown authored Jun 09, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
20bb6baa
Post-merge fixes · 2fedfd94
unknown authored Jun 09, 2006

2fedfd94

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1 · d1ea60d0

unknown authored Jun 09, 2006

into mysql.com:/home/psergey/mysql-5.1-bug19684


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

d1ea60d0

Merge mysql.com:/home/mydev/mysql-5.1--main · b56d30bf
unknown authored Jun 09, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
b56d30bf
Merge mysql.com:/home/mydev/mysql-5.1--main · 61d4377d
unknown authored Jun 09, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
61d4377d

Merge · 12c41f07

unknown authored Jun 09, 2006


sql/log.cc:
  Auto merged
sql/sql_insert.cc:
  SCCS merged

12c41f07

Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 · dd9f7978
unknown authored Jun 09, 2006
```
mysql-test/mysql-test-run.pl:
  Auto merged
```
dd9f7978
Merge mysql.com:/home/mydev/mysql-5.1--main · 5e6945bb
unknown authored Jun 09, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
5e6945bb
Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 · b32f89f0
unknown authored Jun 09, 2006
```
mysql-test/mysql-test-run.pl:
  Auto merged
```
b32f89f0

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

unknown authored Jun 09, 2006

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

2aec2334

Bug #13266 Online adding of MySQLD causes cluster to crash · 15d57f39

unknown authored Jun 09, 2006

- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused


storage/ndb/include/kernel/signaldata/AllocNodeId.hpp:
  Bug #13266 Online adding of MySQLD causes cluster to crash
  - propagate node type on allocation
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Bug #13266 Online adding of MySQLD causes cluster to crash
  - propagate node type on allocation
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Bug #13266 Online adding of MySQLD causes cluster to crash
  - propagate node type on allocation
storage/ndb/src/ndbapi/ndberror.c:
  Bug #13266 Online adding of MySQLD causes cluster to crash
  - propagate node type on allocation

15d57f39

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas · a52693a0
unknown authored Jun 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
```
a52693a0

Merge mysql.com:/home/marty/MySQL/mysql-4.1 · 0dfcd731

unknown authored Jun 09, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  Merge (keeping local)
BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6:
  Merge (keeping local)
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Merge
ndb/include/ndbapi/NdbScanOperation.hpp:
  Merge
ndb/src/ndbapi/NdbScanOperation.cpp:
  Merge
sql/ha_ndbcluster.cc:
  Merge (using local, will fix manually)
sql/ha_ndbcluster.h:
  Merge

0dfcd731

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas · 802f456f
unknown authored Jun 09, 2006
```
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
```
802f456f

ndb - fix 5.1 scan error handling problem · c4323823

unknown authored Jun 09, 2006

  Make sure that error gets set corretly also
    when error code directly after taking mutex


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Make sure that error gets set corretly also
    when error code directly after taking mutex

c4323823

Merge rurik.mysql.com:/home/igor/tmp_merge · 1ac44af4

unknown authored Jun 09, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/ssl.result:
  Manual merge
mysql-test/r/ssl_compress.result:
  Manual merge

1ac44af4

Merge rurik.mysql.com:/home/igor/tmp_merge · b6d2d147

unknown authored Jun 09, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


BitKeeper/deleted/.del-generate_prefix_files.pl:
  Delete: extra/yassl/include/openssl/generate_prefix_files.pl
BitKeeper/deleted/.del-prefix_crypto.h:
  Delete: extra/yassl/include/openssl/prefix_crypto.h
BitKeeper/deleted/.del-prefix_ssl.h:
  Delete: extra/yassl/include/openssl/prefix_ssl.h
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/include/openssl/crypto.h:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
include/violite.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/include/common-tests.inc:
  Auto merged
mysql-test/r/analyze.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
vio/Makefile.am:
  Auto merged
client/Makefile.am:
  Manual merge
libmysqld/Makefile.am:
  Manual merge
mysql-test/r/compress.result:
  Manual merge
mysql-test/r/explain.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/view.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge

b6d2d147

ndb - · b92020c5

unknown authored Jun 09, 2006

  restore --with-ndb-ccflags functionality


config/ac-macros/ha_ndbcluster.m4:
  restore --with-ndb-ccflags functionality

b92020c5

Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. · e2057b93
unknown authored Jun 09, 2006

e2057b93

ndb - testframework · d59011e9

unknown authored Jun 09, 2006

impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases

storage/ndb/src/ndbapi/ClusterMgr.cpp:
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
storage/ndb/test/src/NDBT_Test.cpp:
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases

d59011e9