Commits · 0f55e30fa834083237423cacd3db51c2ff999c06 · Kirill Smelkov / mariadb

20 Jun, 2006 1 commit
- Bug #19543 Out REDO log on subscription creation during startup, missing error message · 0f55e30f
  tomas@poseidon.ndb.mysql.com authored Jun 20, 2006
```
- add error message
```
  0f55e30f
14 Jun, 2006 19 commits
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 49b9b9a0
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  49b9b9a0
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 01046bb7
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  01046bb7
- Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 47271c6b
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- correction of backport error
```
  47271c6b
- Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 2fcf737f
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- make sure to disable bulk insert when check for duplicate key is needed
```
  2fcf737f
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0ecea73c
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  0ecea73c
- corrected merge error · 2f6a4ad3
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
  
  2f6a4ad3
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 8af1a075
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  8af1a075
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 88373a02
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  88373a02
- Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to · 7e2323ed
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
corrupt
  - add infinite retry on drop table temporary error
```
  7e2323ed
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7f026f3a
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  7f026f3a
- Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to corrupt · bdc7a1b7
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- add infinite retry on drop table temporary error
```
  bdc7a1b7
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0a141d6d
  gluh@eagle.intranet.mysql.r18.ru authored Jun 14, 2006
```
into mysql.com:/home/gluh/MySQL/Merge/5.1
```
  0a141d6d
- after merege fix · 00a1b685
  gluh@eagle.intranet.mysql.r18.ru authored Jun 14, 2006
  
  00a1b685
- Update test result to 5.1 format · 644bbd67
  msvensson@neptunus.(none) authored Jun 14, 2006
  
  644bbd67
- post-merge fix · a1020c6e
  gluh@mysql.com authored Jun 14, 2006
  
  a1020c6e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · c30e7916
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  c30e7916
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 02c25f80
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 13, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
```
  02c25f80
- BUG#19307: · 05703aea
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 13, 2006
```
Removed non-static test case
```
  05703aea
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 6d519a23
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 13, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
```
  6d519a23
13 Jun, 2006 7 commits
- ndb: add missing LOCK_open · 2d33bb5c
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
  
  2d33bb5c
- correct initialization of event operation to enable early delete · 764e4e5a
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
  
  764e4e5a
- Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge · 00243ac8
  cmiller@zippy.(none) authored Jun 13, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
```
  00243ac8
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8e2aee1c
  cmiller@zippy.(none) authored Jun 13, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
```
  8e2aee1c
- BUG#19307: CSV engine can cause crashes in partitioned tables (due to its conversion of NULLs to 0) · 59c00340
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 13, 2006
  
  59c00340
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · d2b04770
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 13, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
```
  d2b04770
- fixed test case · c2f0bd70
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 13, 2006
  
  c2f0bd70
12 Jun, 2006 13 commits
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122 · 192033c7
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 12, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
```
  192033c7
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 44076b96
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 12, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
```
  44076b96
- BUG#19122: Need to close handlers before drop/rename phase · 92dec44e
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 12, 2006
```
Fixed comments
```
  92dec44e
- BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE... · 30817b89
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se 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
```
  30817b89
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 · 06850304
  pekka@orca.ndb.mysql.com authored Jun 12, 2006
```
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51
```
  06850304
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695 · 334a28f9
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 12, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
```
  334a28f9
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 744bb5d7
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 12, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
```
  744bb5d7
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 9aa3af67
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 12, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
```
  9aa3af67
- ndb - bug#19872 fix (sufficient for replication) · 800e1e56
  pekka@clam.ndb.mysql.com authored Jun 12, 2006
  
  800e1e56
- Added order by · ae70201a
  mskold@mysql.com authored Jun 12, 2006
  
  ae70201a
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 40e6161f
  mskold@linux.site authored Jun 12, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  40e6161f
- sql_delete.cc: · 38a445fe
  mskold@mysql.com 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
```
  38a445fe
- Merge jonas@perch:src/51-jonas · faa2f091
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  faa2f091