Commits · 5a7f1f8a682a84ad0864ab2e57a60352998e3fd3 · nexedi / MariaDB

06 Jun, 2007 2 commits
- 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
- 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 12 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 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 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
- 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
04 Jun, 2007 16 commits
- Merge mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.0-engines · 262ea6aa
  svoj@april.(none) authored Jun 05, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.1-engines
```
  262ea6aa
- BUG#27141 - Calling tell(-1) under Windows causes assertion failure in Debug mode · bb437f82
  svoj@mysql.com/april.(none) authored Jun 05, 2007
```
Original problem was fixed by Magnus (see BUG25807).

Currently only windows debug build causes assertion failure. This patch assures
that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro.
```
  bb437f82
- 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
- Post-merge fix. · 31c57a1e
  igor@olga.mysql.com authored Jun 04, 2007
  
  31c57a1e
- Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d9fcc304
  mhansson@dl145s.mysql.com authored Jun 04, 2007
```
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
```
  d9fcc304
- after-merge fix. · 9c67f70f
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Jun 04, 2007
  
  9c67f70f
- Merge olga.mysql.com:/home/igor/mysql-5.1 · ca49b83d
  igor@olga.mysql.com authored Jun 03, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
```
  ca49b83d
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9be267cb
  ramil/ram@ramil.myoffice.izhnet.ru authored Jun 04, 2007
```
into  mysql.com:/home/ram/work/b28652/b28652.5.0
```
  9be267cb
- Merge mysql.com:/home/ram/work/b28652/b28652.5.0 · a4e6061a
  ramil/ram@ramil.myoffice.izhnet.ru authored Jun 04, 2007
```
into  mysql.com:/home/ram/work/b28652/b28652.5.1
```
  a4e6061a
03 Jun, 2007 10 commits
- Merge bk-internal:/home/bk/mysql-5.1-opt · 358567df
  mhansson@dl145s.mysql.com authored Jun 03, 2007
```
into  dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
```
  358567df
- item_func.h, item_func.cc: · b642eb12
  evgen@moonbone.local authored Jun 03, 2007
```
  Post merge fix for the bug#28494.
```
  b642eb12
- Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 44b46b73
  igor@olga.mysql.com authored Jun 03, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
```
  44b46b73
- Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql · 6acad85a
  evgen@moonbone.local authored Jun 03, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
```
  6acad85a
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 27d956b5
  evgen@moonbone.local authored Jun 03, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
```
  27d956b5
- user_var.result: · 88147d5c
  evgen@moonbone.local authored Jun 03, 2007
```
  Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.
```
  88147d5c
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 5d695b77
  evgen@moonbone.local authored Jun 03, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
```
  5d695b77
- user_var.result, user_var.test: · 7dbe9d33
  evgen@moonbone.local authored Jun 03, 2007
```
  Extended test case for the bug#28494.
```
  7dbe9d33
- Merge olga.mysql.com:/home/igor/mysql-5.0-opt · cc0eff3e
  igor@olga.mysql.com authored Jun 03, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
```
  cc0eff3e
- Merge bk-internal:/home/bk/mysql-5.0-opt · 8fd809bf
  gkodinov/kgeorge@macbook.gmz authored Jun 03, 2007
```
into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
```
  8fd809bf