Commits · c7f0c9101295aaf8dcee2dc87ec73f5928576ab8 · nexedi / MariaDB

13 Jun, 2007 3 commits
- Already fixed by bug27123 fix · c7f0c910
  mikael@dator6.(none) authored Jun 13, 2007
  
  c7f0c910
- manual merge · cb401dde
  mikael@dator6.(none) authored Jun 13, 2007
  
  cb401dde
- Merge dator6.(none):/home/mikael/mysql_clones/clean-mysql-5.1 · 920a8ed5
  mikael@dator6.(none) authored Jun 13, 2007
```
into  dator6.(none):/home/mikael/mysql_clones/bug18198
```
  920a8ed5
07 Jun, 2007 3 commits
- Merge trift2.:/MySQL/M50/push-5.0 · ee116570
  joerg@trift2. authored Jun 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  ee116570
- Merge trift2.:/MySQL/M41/bug23504-4.1 · d870247d
  joerg@trift2. authored Jun 07, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  d870247d
- netware/*.def : Allocate 128K stack for all executables (bug#23504) · 0d84c3f7
  joerg@trift2. authored Jun 07, 2007
  
  0d84c3f7
06 Jun, 2007 10 commits
- Merge trift2.:/MySQL/M50/mysql-5.0 · d8c385c3
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  d8c385c3
- Merge trift2.:/MySQL/M51/mysql-5.1 · 449cd285
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  449cd285
- Merge trift2.:/MySQL/M50/push-5.0 · 66a17c58
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  66a17c58
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 016cf698
  tomas@whalegate.ndb.mysql.com authored Jun 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
```
  016cf698
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · 7b285522
  tomas@whalegate.ndb.mysql.com authored Jun 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
```
  7b285522
- Merge trift2.:/MySQL/M41/push-4.1 · 86fbe0bd
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  86fbe0bd
- Merge trift2.:/MySQL/M41/mysql-4.1 · fef905d0
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  fef905d0
- Raise version number after cloning 4.1.23 · 0067a9cc
  joerg/mysqldev@mysql.com/production.mysql.com authored Jun 06, 2007
  
  0067a9cc
- Merge trift2.:/MySQL/M50/mysql-5.0 · 3d95b80d
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  3d95b80d
- mtr_report.pl: · 13adcedc
  tsmith@quadxeon.mysql.com authored Jun 06, 2007
```
  Add another exception to the acceptable mysqld errors, for test case for bug 28436
```
  13adcedc
05 Jun, 2007 15 commits
- ctype-bin.c: · 60f6e71e
  tsmith@quadxeon.mysql.com authored Jun 06, 2007
```
  Post-merge fix warning
```
  60f6e71e
- sql_prepare.cc: · 6d867907
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
  Post-merge fix (byte -> uchar)
```
  6d867907
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · dad35dc1
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  dad35dc1
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0ca0984f
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  0ca0984f
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · d2fe24d1
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
  d2fe24d1
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 016bff8a
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  016bff8a
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · 173d07de
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
  173d07de
- Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 8fd5212a
  tomas@poseidon.mysql.com authored Jun 05, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  8fd5212a
- Merge trift2.:/MySQL/M51/clone-5.1 · 27f907b7
  joerg@trift2. authored Jun 05, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  27f907b7
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · ce93bc3d
  tomas@poseidon.mysql.com authored Jun 05, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
```
  ce93bc3d
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 4b938045
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  4b938045
- Bug #28751 Lots of memory locked in memory causes high kswapd · 47d5fb91
  tomas@poseidon.mysql.com authored Jun 05, 2007
```
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
```
  47d5fb91
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 502320ef
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
  502320ef
- Bug #28899 not possible to set separate watchdog timeout at startup · 8c35f44b
  tomas@poseidon.mysql.com authored Jun 05, 2007
  
  8c35f44b
- Merge trift2.:/MySQL/M51/mysql-5.1 · 7c9a8168
  joerg@trift2. authored Jun 05, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  7c9a8168
04 Jun, 2007 9 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user · c5e13ae0
  tomas@whalegate.ndb.mysql.com authored Jun 04, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
```
  c5e13ae0
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 9317cd4c
  iggy@amd64.(none) authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my41-bug24400
```
  9317cd4c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 2e892d30
  iggy@amd64.(none) authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my50-bug24400
```
  2e892d30
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 2cdb525f
  iggy@amd64.(none) authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my51-bug24400
```
  2cdb525f
- Merge amd64.(none):/src/bug24400/my50-bug24400 · 375dff28
  iggy@amd64.(none) authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my51-bug24400
```
  375dff28
- Merge amd64.(none):/src/bug24400/my41-bug24400 · 9346e924
  iggy@amd64.(none) authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my50-bug24400
```
  9346e924
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 76b580b8
  igor@olga.mysql.com authored Jun 04, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.1-opt
```
  76b580b8
- Post-merge fix. · d0cb11e6
  igor@olga.mysql.com authored Jun 04, 2007
  
  d0cb11e6
- Merge olga.mysql.com:/home/igor/mysql-5.0-opt · a5011de0
  igor@olga.mysql.com authored Jun 04, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
```
  a5011de0