Commits · 2250d1a752eda468f723c930b3bc71bd914faacb · nexedi / MariaDB

20 Mar, 2007 27 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 2250d1a7
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  2250d1a7
- Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint · 1f1bb54c
  mtaylor@qualinost.(none) authored Mar 20, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
```
  1f1bb54c
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 240bbc6d
  kent@kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  240bbc6d
- Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init · 02fc829f
  mtaylor@qualinost.(none) authored Mar 20, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  02fc829f
- echo.c: · 39e9a2d3
  kent@mysql.com/kent-amd64.(none) authored Mar 20, 2007
```
  Corrected GPL to be version 2 only
```
  39e9a2d3
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · a149769b
  kent@kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  a149769b
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · a9477087
  kent@kent-amd64.(none) authored Mar 20, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  a9477087
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · cd686bf7
  iggy@recycle.(none) authored Mar 20, 2007
```
into  recycle.(none):/src/bug25765/my51-bug25765
```
  cd686bf7
- Merge polly.local:/tmp/maint/bug23775/my50-bug23775 · 41992a27
  kaa@polly.local authored Mar 20, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  41992a27
- Post Merge Fix. · ebbd5525
  iggy@recycle.(none) authored Mar 20, 2007
  
  ebbd5525
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 41bdc9c1
  kaa@polly.local authored Mar 20, 2007
```
into  polly.local:/tmp/maint/mysql-5.1-maint
```
  41bdc9c1
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · aab816e7
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  aab816e7
- Merge recycle.(none):/src/bug25765/my50-bug25765 · 8ecbf6c0
  iggy@recycle.(none) authored Mar 20, 2007
```
into  recycle.(none):/src/bug25765/my51-bug25765
```
  8ecbf6c0
- Bug#25765 too many dbg heap assertions on windows · 9a5f0bff
  iggy@recycle.(none) authored Mar 20, 2007
```
- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.
```
  9a5f0bff
- tests fixed to work in embedded server · 0233b135
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 20, 2007
  
  0233b135
- Merge polly.local:/tmp/maint/bug23775/my51-bug23775 · 24052c23
  kaa@polly.local authored Mar 20, 2007
```
into  polly.local:/tmp/maint/mysql-5.1-maint
```
  24052c23
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 50c90912
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  50c90912
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · f6c30190
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  f6c30190
- small build fix · 56856d6f
  df@pippilotta.erinye.com authored Mar 20, 2007
  
  56856d6f
- build fix for netware · 8161dcaa
  df@pippilotta.erinye.com authored Mar 20, 2007
  
  8161dcaa
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e4a9917b
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  e4a9917b
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · bc7e1eee
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  bc7e1eee
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 310c281c
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  310c281c
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · f1b1eb03
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  f1b1eb03
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 9ff0553f
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  9ff0553f
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5572ab14
  df@pippilotta.erinye.com authored Mar 20, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  5572ab14
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 45fb6c90
  ibabaev@bk-internal.mysql.com authored Mar 20, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
```
  45fb6c90
19 Mar, 2007 13 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · f2fc78e8
  tsmith@quadxeon.mysql.com authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  f2fc78e8
- sql_insert.cc: · 41c73249
  evgen@moonbone.local authored Mar 20, 2007
```
  After merge fix.
```
  41c73249
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 0eae26ef
  tsmith@quadxeon.mysql.com authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  0eae26ef
- Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql · 37add3b6
  evgen@moonbone.local authored Mar 20, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
```
  37add3b6
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 6252477a
  tsmith@quadxeon.mysql.com authored Mar 19, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  6252477a
- sql_insert.cc: · 31b9145a
  evgen@moonbone.local authored Mar 20, 2007
```
  Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.
```
  31b9145a
- Merge trift2.:/MySQL/M50/clone-5.0 · 90879b57
  joerg@trift2. authored Mar 19, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  90879b57
- BUG#27270 Can't compile latest 5.1-main · eb0ddb21
  df@pippilotta.erinye.com authored Mar 19, 2007
  
  eb0ddb21
- make_win_bin_dist: · e9d65ba3
  kent@mysql.com/kent-amd64.(none) authored Mar 19, 2007
```
  Restore accidently removed line
```
  e9d65ba3
- Many files: · 19a6a091
  kent@mysql.com/kent-amd64.(none) authored Mar 19, 2007
```
  Major cleanup of old Visual Studio project files, aligning engines etc
```
  19a6a091
- Merge mysqldev@production.mysql.com:my/mysql-5.0-release/ · 3b1d0c2a
  joerg@trift2. authored Mar 19, 2007
```
into  trift2.:/MySQL/M50/clone-5.0
```
  3b1d0c2a
- netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the NetWare builds. · 1e3cec54
  joerg@trift2. authored Mar 19, 2007
  
  1e3cec54
- Merge dev:my/mysql-5.0-release · 4f7677cd
  df@pippilotta.erinye.com authored Mar 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
```
  4f7677cd