Commits · 13ded6a6ca3f11708b61c29f67ec67961dbf514c · Kirill Smelkov / mariadb

14 Jun, 2006 34 commits
- Merge xiphis.org:/home/antony/work2/p2-bug20168.2 · 13ded6a6
  acurtis@xiphis.org authored Jun 14, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug20168.4
```
  13ded6a6
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 2746b739
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
```
  2746b739
- 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 jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9b79108e
  joerg@trift2. authored Jun 14, 2006
```
into mysql.com:/M51/bug18810-5.1
```
  9b79108e
- Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 · 075bb7fa
  joerg@trift2. authored Jun 14, 2006
  
  075bb7fa
- Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 · 6448fca6
  joerg@mysql.com authored Jun 14, 2006
  
  6448fca6
- support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 · 054cc44e
  joerg@mysql.com authored Jun 14, 2006
  
  054cc44e
- Fixed variable description · 61788c74
  mskold@mysql.com authored Jun 14, 2006
  
  61788c74
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · c70ed99f
  mskold@linux.site authored Jun 14, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  c70ed99f
- After merge fix. · 5d4b5dea
  svoj@may.pils.ru authored Jun 14, 2006
  
  5d4b5dea
- Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.0-merge · 64bcd2cc
  svoj@may.pils.ru authored Jun 14, 2006
```
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1
```
  64bcd2cc
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 274a23a9
  mskold@linux.site authored Jun 14, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  274a23a9
- Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 4ec47c9c
  msvensson@neptunus.(none) authored Jun 14, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  4ec47c9c
- 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
- Added flag to detect renaming of fields (not supported as fast alter table for... · 5660fa6b
  mskold@mysql.com authored Jun 14, 2006
```
Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking
```
  5660fa6b
- Added flag to detect renaming of fields (not supported as fast alter table for... · de28afe2
  mskold@mysql.com authored Jun 14, 2006
```
Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case
```
  de28afe2
- Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster) · a6ebed7c
  mskold@mysql.com authored Jun 14, 2006
  
  a6ebed7c
- 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 6 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
- Bug#20168 · e6d763be
  acurtis@xiphis.org authored Jun 13, 2006
```
  "--default-storage-engine=XXX" doesn't work
  typo in the code and forgotten changes
```
  e6d763be
- 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