Commits · a06dda12fdc2dcb301ffb5169d49f8712ed990d2 · Kirill Smelkov / mariadb

15 Jun, 2006 10 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a06dda12
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  a06dda12
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 03a80df3
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  03a80df3
- Fixed typo in variable name · 32c45f92
  mskold@mysql.com authored Jun 15, 2006
  
  32c45f92
- Removed stray bracket · 7636df86
  mskold@mysql.com authored Jun 15, 2006
  
  7636df86
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 22bb0263
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  22bb0263
- Merge rurik.mysql.com:/home/igor/tmp_merge · 88b0e989
  igor@rurik.mysql.com authored Jun 14, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
  88b0e989
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a2bb34ce
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  a2bb34ce
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2b02a2aa
  acurtis@ltamd64.xiphis.org authored Jun 14, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug20168.4
```
  2b02a2aa
- merge fixes · 3e0cfd1b
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
  
  3e0cfd1b
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · d02f358a
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  d02f358a
14 Jun, 2006 30 commits
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · fea2fa62
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  fea2fa62
- merge update · 67e6e8b4
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
  
  67e6e8b4
- cleanup String::set(integer) · 99fd8f72
  serg@serg.mylan authored Jun 14, 2006
  
  99fd8f72
- 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 bk-internal.mysql.com:/home/bk/mysql-5.1 · 7549dac0
  serg@serg.mylan authored Jun 14, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  7549dac0
- 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
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801 · 8484ea8b
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  8484ea8b
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · e91454f8
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
```
  e91454f8
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · b51515c9
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801
```
  b51515c9
- BUG#19801: Problems with single partition with only NULL allowed in LIST partitioning · ac0354c7
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
After review fix
```
  ac0354c7
- BUG#16002: Unsigned partition function support · 2dd60990
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 14, 2006
```
After review fix
```
  2dd60990
- Fixed variable description · 61788c74
  mskold@mysql.com authored Jun 14, 2006
  
  61788c74
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 90e3ff1e
  serg@serg.mylan authored Jun 14, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  90e3ff1e
- 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