Commits · edc43b4d84a2d3942005c428ce11653ad9ae897a · Kirill Smelkov / mariadb

23 Aug, 2006 1 commit
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1 · edc43b4d
  tnurnberg@salvation.intern.azundris.com authored Aug 23, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
```
  edc43b4d
22 Aug, 2006 1 commit
- Update result file for "grant" to 5.1 version · b2a95f0d
  msvensson@neptunus.(none) authored Aug 22, 2006
  
  b2a95f0d
21 Aug, 2006 9 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d170f1b1
  cmiller@zippy.cornsilk.net authored Aug 21, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  d170f1b1
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f98b21b7
  rburnett@bk-internal.mysql.com authored Aug 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  f98b21b7
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · f2f90320
  cmiller@zippy.cornsilk.net authored Aug 21, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  f2f90320
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · ff57b304
  cmiller@zippy.cornsilk.net authored Aug 21, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
  ff57b304
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1 · f5ffa66c
  tnurnberg@salvation.intern.azundris.com authored Aug 21, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
```
  f5ffa66c
- mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries, · 47d6296b
  joerg@trift2. authored Aug 21, 2006
```
because searching for them makes the script abort with all non-NDB builds.
```
  47d6296b
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1 · 92631046
  tnurnberg@salvation.intern.azundris.com authored Aug 21, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
```
  92631046
- Many files: · b329f2c3
  kent@mysql.com/g4-2.local authored Aug 21, 2006
```
  Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
```
  b329f2c3
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · e37e0786
  rburnett@bk-internal.mysql.com authored Aug 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  e37e0786
20 Aug, 2006 1 commit
- Fix for bug #21642: "configure" with no arguments does not build · 56443ae2
  jpipes@shakedown.(none) authored Aug 20, 2006
  
  56443ae2
18 Aug, 2006 3 commits
- Fix for the failing gis.test · cf76884b
  holyfoot/hf@mysql.com/deer.(none) authored Aug 18, 2006
  
  cf76884b
- mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721 · 1f79db41
  joerg@trift2. authored Aug 18, 2006
  
  1f79db41
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d094b5f2
  rburnett@bk-internal.mysql.com authored Aug 18, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  d094b5f2
17 Aug, 2006 16 commits
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9e922430
  tnurnberg@salvation.intern.azundris.com authored Aug 17, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
```
  9e922430
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 4b7e3775
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  4b7e3775
- 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
- rename to avoid case sensitive collision · 9d531c4f
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
  
  9d531c4f
- Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51 · d7cbdfaa
  tnurnberg@salvation.intern.azundris.com authored Aug 17, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
```
  d7cbdfaa
- 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 bk-internal.mysql.com:/data0/bk/mysql-5.1 · 1bfe7668
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  1bfe7668
- 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 9 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