Commits · acee0c8e20772b6674eebcd26ee43a8901b6d2a6 · nexedi / MariaDB

27 Apr, 2007 5 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · acee0c8e
  tsmith@quadxeon.mysql.com authored Apr 28, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  acee0c8e
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · df2d9ca9
  tsmith@quadxeon.mysql.com authored Apr 28, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  df2d9ca9
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 · 33a74e41
  tsmith@quadxeon.mysql.com authored Apr 28, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  33a74e41
- Bug #27390: mysqld_multi --config-file= not working as documented · b90b0c7e
  tsmith@quadxeon.mysql.com authored Apr 28, 2007
```
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options.  Treat old --config-file argument as if --defaults-extra-file
had been specified instead.

Plus a few other defaults-related cleanups.
```
  b90b0c7e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 01b20b95
  kaa@polly.local authored Apr 27, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  01b20b95
26 Apr, 2007 11 commits
- mysql_install_db.sh: Fix algorithm for finding pkgdata directory · 70a742f8
  tsmith@quadxeon.mysql.com authored Apr 27, 2007
  
  70a742f8
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · abcb45d2
  tsmith@quadxeon.mysql.com authored Apr 26, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50
```
  abcb45d2
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines · 29d2d5dc
  svoj@mysql.com/april.(none) authored Apr 27, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  29d2d5dc
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · ce55046f
  svoj@mysql.com/april.(none) authored Apr 27, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  ce55046f
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build · f6989772
  svoj@mysql.com/april.(none) authored Apr 27, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
```
  f6989772
- Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364 · 02f2616e
  kaa@polly.local authored Apr 26, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  02f2616e
- Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0 · 03f4492b
  joerg@trift-lap.fambruehe authored Apr 26, 2007
```
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
```
  03f4492b
- Merge trift-lap.fambruehe:/MySQL/M41/push-4.1 · 5af470ee
  joerg@trift-lap.fambruehe authored Apr 26, 2007
```
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
```
  5af470ee
- Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1 · 69d39592
  joerg@trift-lap.fambruehe authored Apr 26, 2007
```
into  trift-lap.fambruehe:/MySQL/M41/push-4.1
```
  69d39592
- Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 · 2ed38330
  joerg@trift-lap.fambruehe authored Apr 26, 2007
```
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
```
  2ed38330
- Merge bk-internal:/home/bk/mysql-5.0-maint · 27418637
  msvensson@pilot.blaudden authored Apr 26, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  27418637
25 Apr, 2007 4 commits
- Fix test case that was broken for builds without InnoDB. · e0f148d5
  df@pippilotta.erinye.com authored Apr 25, 2007
  
  e0f148d5
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · 9e4cc9e3
  tsmith@quadxeon.mysql.com authored Apr 25, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  9e4cc9e3
- Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262 · 6e4acae6
  msvensson@pilot.blaudden authored Apr 25, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  6e4acae6
- mysql_install_db.sh: · 4d346143
  tsmith@quadxeon.mysql.com authored Apr 25, 2007
```
  Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
```
  4d346143
24 Apr, 2007 15 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 5ac0fc32
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  5ac0fc32
- restrict recently added file to GPLv2 · adf57595
  df@pippilotta.erinye.com authored Apr 24, 2007
  
  adf57595
- 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 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 pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 6e1a6c73
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  6e1a6c73
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 211ddd4b
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  211ddd4b
- Merge mysql.com:/home/ram/work/mysql-4.1-maint · 1d0f9bed
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.4.1
```
  1d0f9bed
- Merge mysql.com:/home/ram/work/mysql-4.1-maint · 250ae972
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.4.1
```
  250ae972
- 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
- 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 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 · 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
- Bug#24732 Executables do not include Vista manifests · 5cf93071
  iggy@recycle.(none) authored Apr 23, 2007
```
- Correct PushBuild failure.
```
  5cf93071
23 Apr, 2007 5 commits
- 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
- 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
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · 12147d95
  tsmith@quadxeon.mysql.com authored Apr 23, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
```
  12147d95
- 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