Commits · 630450679ac317c781b4c03847aba88cb973e298 · nexedi / MariaDB

11 Jun, 2007 1 commit
- Merge chilla.local:/home/mydev/mysql-5.1-amain · 63045067
  istruewing@chilla.local authored Jun 11, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  63045067
08 Jun, 2007 1 commit
- BUG#26976 - Missing table in merge not noted in related error msg + · a1529d92
  svoj@mysql.com/june.mysql.com authored Jun 08, 2007
```
            SHOW CREATE TABLE fails

After merge fixes.
```
  a1529d92
07 Jun, 2007 5 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
- Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines · d0a044a0
  svoj@june.mysql.com authored Jun 07, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
```
  d0a044a0
- Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines · c45b4cf8
  svoj@june.mysql.com authored Jun 07, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
```
  c45b4cf8
06 Jun, 2007 16 commits
- Merge xiphis.org:/home/antony/work2/mysql-5.0-merge · 1f0aca96
  acurtis/antony@ltamd64.xiphis.org authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.1-merge
```
  1f0aca96
- Merge xiphis.org:/home/antony/work2/mysql-4.1-engines.merge · aab34271
  acurtis/antony@ltamd64.xiphis.org authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
```
  aab34271
- Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · af72b54f
  acurtis/antony@ltamd64.xiphis.org authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
```
  af72b54f
- Merge xiphis.org:/home/antony/work2/mysql-5.1-engines · 5a7f1f8a
  acurtis/antony@ltamd64.xiphis.org authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
```
  5a7f1f8a
- Merge xiphis.org:/home/antony/work2/mysql-4.1-engines · e112a475
  acurtis/antony@xiphis.org/ltamd64.xiphis.org authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
```
  e112a475
- 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 tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 75ed2c7d
  tsmith@quadxeon.mysql.com authored Jun 06, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
```
  75ed2c7d
- 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 17 commits
- BUG#26976 - Missing table in merge not noted in related error msg + · bd8f81f4
  svoj@mysql.com/april.(none) authored Jun 06, 2007
```
            SHOW CREATE TABLE fails

Underlying table names, that merge engine fails to open were not
reported.

With this fix CHECK TABLE issued against merge table reports all
underlying table names that it fails to open. Other statements
are unaffected, that is underlying table names are not included
into error message.

This fix doesn't solve SHOW CREATE TABLE issue.
```
  bd8f81f4
- 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 chilla.local:/home/mydev/mysql-5.0-axmrg · 83acfa8e
  istruewing@chilla.local authored Jun 05, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  83acfa8e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a28abc05
  istruewing@chilla.local authored Jun 05, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  a28abc05
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 594c39bc
  istruewing@chilla.local authored Jun 05, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  594c39bc
- 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