Commits · c6377e660cf3bfd61163250ebd3bb3aed95bbd77 · nexedi / MariaDB

24 Apr, 2007 27 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c6377e66
  tomas@whalegate.ndb.mysql.com authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  c6377e66
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 64d2bea6
  tomas@whalegate.ndb.mysql.com authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  64d2bea6
- Added missing backslash · f7098f76
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
  
  f7098f76
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · cabef956
  mskold/marty@linux.site authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  cabef956
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · fb6b0708
  mskold/marty@linux.site authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  fb6b0708
- ha_ndbcluster.h, ha_ndbcluster.cc: · eaba3f25
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
```
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge
```
  eaba3f25
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · b841154e
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  b841154e
- Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 · 9bd17ef1
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  9bd17ef1
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 8bbdc58b
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  8bbdc58b
- Merge bk-internal:/home/bk/mysql-5.0-maint · 88ad41e2
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  88ad41e2
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 45631375
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  45631375
- Merge bk-internal:/home/bk/mysql-5.0-maint · ffd0d33f
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  ffd0d33f
- Moved method definition to ease merge to 5.1 · 25ecc738
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
  
  25ecc738
- Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 · f028e17a
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  f028e17a
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · d4cb37e8
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  d4cb37e8
- Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade · a4ee7302
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  a4ee7302
- Merge mysql.com:/home/ram/work/mysql-5.0-maint · 49b18703
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.5.0
```
  49b18703
- after-merge fix · 244c1923
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
  
  244c1923
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · b4b9a326
  mskold/marty@linux.site authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  b4b9a326
- Back-ported compiler warning fixes from 5.1 to ease merging · c68a4c9c
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
  
  c68a4c9c
- Merge mysql.com:/home/ram/work/b27515/b27515.5.0 · 3935e224
  ramil/ram@ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.5.1
```
  3935e224
- after-merge fix · d1386154
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
  
  d1386154
- Merge mysql.com:/home/ram/work/b27515/b27515.4.1 · bb3b6ae7
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.5.0
```
  bb3b6ae7
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 45400e5c
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
  45400e5c
- Post Merge Correction · f4569bd5
  iggy@recycle.(none) authored Apr 23, 2007
  
  f4569bd5
- Merge recycle.(none):/src/bug24732/my50-bug24732 · b118b412
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my51-bug24732
```
  b118b412
- Bug#24732 Executables do not include Vista manifests · 5cf93071
  iggy@recycle.(none) authored Apr 23, 2007
```
- Correct PushBuild failure.
```
  5cf93071
23 Apr, 2007 13 commits
- Merge recycle.(none):/src/mysql-5.1-maint · e251139c
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_25141
```
  e251139c
- Merge recycle.(none):/src/mysql-5.1-maint · ba01167c
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_27691
```
  ba01167c
- Bug #27691 bk compilation with VC++ 2005 fails · 4bde20d1
  iggy@recycle.(none) authored Apr 23, 2007
```
- Added appropiate casts.
```
  4bde20d1
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4a50d613
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
  4a50d613
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 7c68e689
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my51-bug24732
```
  7c68e689
- Bug#24732 Executables do not include Vista manifests · 13b54aa9
  iggy@recycle.(none) authored Apr 23, 2007
```
- Post merge cleanup.
```
  13b54aa9
- Merge recycle.(none):/src/bug24732/my50-bug24732 · 658d2127
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my51-bug24732
```
  658d2127
- Bug#24732 Executables do not include Vista manifests · 7a358c4b
  iggy@recycle.(none) authored Apr 23, 2007
```
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
```
  7a358c4b
- mysql_upgrade.test: · 53985105
  tsmith@quadxeon.mysql.com authored Apr 23, 2007
```
  Fix minor merge "oopsie"
```
  53985105
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 193e154e
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my50-bug25621
```
  193e154e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 0b88f8c7
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my51-bug25621
```
  0b88f8c7
- Merge recycle.(none):/src/bug25621/my50-bug25621 · b8ac729f
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug25621/my51-bug25621
```
  b8ac729f
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · cf8ef29c
  tomas@whalegate.ndb.mysql.com authored Apr 23, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  cf8ef29c