Commits · 45d7e75cb75e7de9adb18190a4ab944530b1e3e9 · nexedi / MariaDB

16 Jun, 2006 2 commits
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 45d7e75c
  stewart@mysql.com authored Jun 16, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
```
  45d7e75c
- Merge mysql.com:/home/marty/MySQL/mysql-5.0 · 49790e0d
  mskold@mysql.com authored Jun 16, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  49790e0d
15 Jun, 2006 19 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ce07f4b9
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  ce07f4b9
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5d2d3a53
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
  5d2d3a53
- BUG#19940: Add Valgrind suppression for false alarm report. · 061bdf91
  knielsen@mysql.com authored Jun 15, 2006
  
  061bdf91
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · c8da9ebd
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
  c8da9ebd
- BUG#20397: Crash when alter table t1 engine = x; · b631659c
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
Review fixes
```
  b631659c
- don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS · 3c609f0a
  serg@serg.mylan authored Jun 15, 2006
```
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts
```
  3c609f0a
- Fix for bug#19667 group by a decimal expression yields wrong result · 00fcdf8c
  gluh@eagle.intranet.mysql.r18.ru authored Jun 15, 2006
  
  00fcdf8c
- Merge mysql.com:/home/mydev/mysql-5.1--main · 33e38a67
  ingo@chilla.local authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  33e38a67
- 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 mysql.com:/home/mydev/mysql-5.0-amerge · 2b6b5b63
  ingo@mysql.com authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  2b6b5b63
- 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 19 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 msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 94c9e172
  msvensson@devsrv-b.mysql.com authored Jun 14, 2006
```
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
```
  94c9e172
- 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 tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 476caec5
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  476caec5
- Bug#19191 Repeated crashes on OpenBSD for ssl test cases · 4fcf3290
  msvensson@neptunus.(none) authored Jun 14, 2006
```
 - Import patch from yaSSL
```
  4fcf3290
- 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-5.0 · 0c805b3f
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  0c805b3f
- 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 mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0 · 15926709
  joerg@mysql.com authored Jun 14, 2006
  
  15926709
- 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