Commits · b19c1896adea1166adb8e80552ac3abfa7642205 · Kirill Smelkov / mariadb

13 Jun, 2006 2 commits
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · b19c1896
  unknown authored Jun 13, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
```
  b19c1896
- fixed test case · f6d40961
  unknown authored Jun 13, 2006
  
  f6d40961
12 Jun, 2006 24 commits

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122 · 3e8008b1

unknown authored Jun 12, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


mysql-test/r/partition_range.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge

3e8008b1

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 6b2d502a

unknown authored Jun 12, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged

6b2d502a

BUG#19122: Need to close handlers before drop/rename phase · 3166382d
unknown authored Jun 12, 2006
```
Fixed comments


sql/sql_partition.cc:
  Fixed comments
```
3166382d

BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE... · 14c0751c

unknown authored Jun 12, 2006

BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions
After review fix


mysql-test/r/partition.result:
  Fixes for test
mysql-test/t/partition.test:
  Fixes for test
sql/lock.cc:
  After review fix
sql/mysql_priv.h:
  After review fix
sql/sql_partition.cc:
  After review fix

14c0751c

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 · b5697a5f
unknown authored Jun 12, 2006
```
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51
```
b5697a5f
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695 · c5d38c17
unknown authored Jun 12, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


sql/sql_partition.cc:
  Auto merged
```
c5d38c17

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 3247d60d

unknown authored Jun 12, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695


BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/r/partition_02myisam.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge
sql/sql_partition.h:
  manual merge
sql/sql_show.cc:
  manual merge
sql/sql_table.cc:
  manual merge

3247d60d

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · ad193962

unknown authored Jun 12, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


sql/ha_partition.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged

ad193962

ndb - bug#19872 fix (sufficient for replication) · b66f3574

unknown authored Jun 12, 2006


storage/ndb/test/ndbapi/test_event.cpp:
  test applier under merge events
  also fix run in 5.1 (check for data event)
storage/ndb/test/run-test/daily-devel-tests.txt:
  add: test_event -n MergeEventOperationApplier_NR
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  allow idempotency INSoINS or DELoDEL
  does NOT check data section 2 (before data)

b66f3574

Added order by · def8e0ce
unknown authored Jun 12, 2006

def8e0ce

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

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

334453f9

sql_delete.cc: · 77446405

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

77446405

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

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

12655063

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

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

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

059d28f7

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

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

ce450e50

Bug #20336 CLUSTERLOG commands have no effect · 40d687eb

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

40d687eb

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

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

6ac45568

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

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

55d554bd

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

Merge mysql.com:/home/marty/MySQL/mysql-4.1 · 8ea10584

unknown authored Jun 12, 2006

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


sql/ha_ndbcluster.cc:
  Merge (using local)

8ea10584

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

e3a975c5
Added lock test on index scan · a3f36966
unknown authored Jun 12, 2006

a3f36966
Moved back comment to correct method · fc9da882
unknown authored Jun 12, 2006

fc9da882

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

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

45d01b1a
Merge rurik.mysql.com:/home/igor/mysql-5.1 · 87b06d07
unknown authored Jun 09, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
87b06d07
Post-merge fixes · 388e8843
unknown authored Jun 09, 2006

388e8843

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

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

2ef66fca

Merge mysql.com:/home/mydev/mysql-5.1--main · 761c75f3
unknown authored Jun 09, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
761c75f3
Merge mysql.com:/home/mydev/mysql-5.1--main · 0e0755ea
unknown authored Jun 09, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
0e0755ea

Merge · 0ad73944

unknown authored Jun 09, 2006


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

0ad73944

Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 · 2da24bb6
unknown authored Jun 09, 2006
```
mysql-test/mysql-test-run.pl:
  Auto merged
```
2da24bb6
Merge mysql.com:/home/mydev/mysql-5.1--main · cd53e516
unknown authored Jun 09, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
cd53e516
Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 · 741edd2e
unknown authored Jun 09, 2006
```
mysql-test/mysql-test-run.pl:
  Auto merged
```
741edd2e

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

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

8e206126

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

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

be6403eb