Commits · f8c036a0521e05518602532d959c211b13038669 · nexedi / MariaDB

07 Jun, 2007 4 commits
- Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint · f8c036a0
  msvensson@pilot.(none) authored Jun 07, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
```
  f8c036a0
- Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint · 7368985c
  msvensson@pilot.(none) authored Jun 07, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
```
  7368985c
- Merge pilot.(none):/data/msvensson/mysql/bug10218/my41-bug10218 · 65919873
  msvensson@pilot.(none) authored Jun 07, 2007
```
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
```
  65919873
- Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 · c6742434
  kaa@polly.local authored Jun 07, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  c6742434
06 Jun, 2007 3 commits
- Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895 · 8303cfd9
  kaa@polly.local authored Jun 06, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
```
  8303cfd9
- Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 · c48b9d6c
  kaa@polly.local authored Jun 06, 2007
```
into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
```
  c48b9d6c
- 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 10 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
- Fix for bug #28895 "Test 'information_schema_db' fails on i5/OS 32 bit". · 35dd1fc5
  kaa@polly.local authored Jun 05, 2007
```
In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.
```
  35dd1fc5
- 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 15 commits
- 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
- Bug#10218 Command line recall rolls into Segmentation Fault(coredump)' · 5df79044
  msvensson@pilot.(none) authored Jun 04, 2007
```
 - Declare 'tgoto' if not already declared in system header files. 
```
  5df79044
- 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 8 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