Commits · e0592f53cb4fdc3eb51b1a49deaa592e95f0ada4 · Kirill Smelkov / mariadb

18 Aug, 2006 5 commits
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e0592f53
  tnurnberg@salvation.intern.azundris.com authored Aug 18, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
```
  e0592f53
- Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-maint · da694387
  tnurnberg@salvation.intern.azundris.com authored Aug 18, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
```
  da694387
- innodb r702 · c8d1c498
  tnurnberg@salvation.intern.azundris.com authored Aug 18, 2006
```
innodb r719
```
  c8d1c498
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 9e5db9f6
  cmiller@zippy.cornsilk.net authored Aug 18, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
```
  9e5db9f6
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · dc1e1776
  cmiller@zippy.cornsilk.net authored Aug 18, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  dc1e1776
17 Aug, 2006 16 commits
- A couple of adjustments to the merge to fix the broken build · 284fa931
  rburnett@production.mysql.com authored Aug 17, 2006
```
instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*
```
  284fa931
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 99b113f4
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
```
  99b113f4
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d35e75c
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  6d35e75c
- rename to avoid case sensitive collision · 9d531c4f
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
  
  9d531c4f
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · e65a3e97
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
```
  e65a3e97
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · c821fa8b
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  c821fa8b
- Merge bk-internal.mysql.com:/data0/bk/tmp_reg · d65095b4
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
```
  d65095b4
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 64092ca9
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  64092ca9
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 6998c514
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  6998c514
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 7d38d613
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  7d38d613
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 030ddb48
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  030ddb48
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · c627a6ce
  cmiller@zippy.cornsilk.net authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
```
  c627a6ce
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 781658d6
  tnurnberg@maint1.mysql.com authored Aug 17, 2006
```
into  maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
```
  781658d6
- temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658 · d1e1ea2c
  tnurnberg@salvation.intern.azundris.com authored Aug 17, 2006
  
  d1e1ea2c
- merge warning test results (!) · dd1d46c2
  pgalbraith/patg@govinda.patg.net authored Aug 16, 2006
  
  dd1d46c2
- test result changes (non-functional) for 5.1-5.0 merge · ceb7cb55
  pgalbraith/patg@govinda.patg.net authored Aug 16, 2006
  
  ceb7cb55
16 Aug, 2006 19 commits
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · 00ab7be7
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
```
  00ab7be7
- manual merge · af844dbe
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
  
  af844dbe
- manual merge · 4550b9d0
  tnurnberg@salvation.intern.azundris.com authored Aug 16, 2006
  
  4550b9d0
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · ca6532af
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
```
  ca6532af
- Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51 · 2c16439d
  tnurnberg@salvation.intern.azundris.com authored Aug 16, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
```
  2c16439d
- Bug#20328 - Correction to test/result for broken Windows build. · a86f035a
  iggy@rolltop.ignatz42.dyndns.org authored Aug 16, 2006
  
  a86f035a
- merge 5.0 -> 5.1, re-enabling federated, disabled partition · 370f2241
  pgalbraith/patg@govinda.patg.net authored Aug 16, 2006
  
  370f2241
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b56ff548
  patg@govinda.patg.net authored Aug 16, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
```
  b56ff548
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 79ad722e
  patg@govinda.patg.net authored Aug 16, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
```
  79ad722e
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 38a36da8
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  38a36da8
- small fix to enable the test suite to find executables and scripts on Windows · 55165b2f
  reggie@big_geek. authored Aug 16, 2006
  
  55165b2f
- Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 · da60a519
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  da60a519
- Merge shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328 · c4005628
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  c4005628
- Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 · 496a04cc
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328
```
  496a04cc
- Bug#20328 mysql client: dumb about trailing spaces on 'help' command · 98eaa076
  msvensson@shellback.(none) authored Aug 16, 2006
```
 Fix testcase to also work on windows
```
  98eaa076
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 8baecf7e
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  8baecf7e
- Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219 · 27a41546
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  27a41546
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · b9632935
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  b9632935
- Merge shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219 · 685937a7
  msvensson@shellback.(none) authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  685937a7