Commits · 287a7bdfe6c764586118a2ccf231d9c7b9e55669 · nexedi / MariaDB

13 Jun, 2006 3 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 287a7bdf
  unknown authored Jun 13, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/sql_show.cc:
  Auto merged
```
  287a7bdf
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · f712303e
  unknown authored Jun 13, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
```
  f712303e
- fixed test case · 43f62105
  unknown authored Jun 13, 2006
  
  43f62105
12 Jun, 2006 25 commits

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

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

66176817

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

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

be2c2ad2

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


sql/sql_partition.cc:
  Fixed comments
```
7f1a78fc

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

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

71e1ca32

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


sql/sql_partition.cc:
  Auto merged
```
8ff779a5

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

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

4032afb4

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

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

cc67d824

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

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)

f395e89e

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 97bf55e0
unknown authored Jun 12, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
97bf55e0
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 11 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

Many files: · b8549bb7

unknown authored Jun 09, 2006

  Merging changesets from crashed 5.1-kt


mysql-test/r/information_schema_part.result:
  Merging changesets from crashed 5.1-kt
mysql-test/r/partition.result:
  Merging changesets from crashed 5.1-kt
mysql-test/r/partition_02myisam.result:
  Merging changesets from crashed 5.1-kt
mysql-test/r/partition_mgm_err.result:
  Merging changesets from crashed 5.1-kt
mysql-test/r/partition_range.result:
  Merging changesets from crashed 5.1-kt
mysql-test/r/rpl_row_basic_8partition.result:
  Merging changesets from crashed 5.1-kt
sql/sql_show.cc:
  Merging changesets from crashed 5.1-kt

b8549bb7

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