Commits · 7018d9c5aa3f73fd6840d522ee528ddfdb941e52 · Kirill Smelkov / mariadb

20 Mar, 2007 39 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 7018d9c5
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  7018d9c5
- 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 tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 3f16977b
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  3f16977b
- enabled test case · 7bd5241c
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
+ some fixes to do the enable
```
  7bd5241c
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 8c375120
  jonas@perch.ndb.mysql.com authored Mar 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  8c375120
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 42b3e0a5
  jonas@perch.ndb.mysql.com authored Mar 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  42b3e0a5
- ndb - bug#27283 (wl2325-5.0) · 844845c7
  jonas@perch.ndb.mysql.com authored Mar 20, 2007
```
    Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
```
  844845c7
- ndb - bug#27291 · 78980793
  jonas@perch.ndb.mysql.com authored Mar 20, 2007
```
  Fix correct min-value for LockPagesInMemory
```
  78980793
- 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
- BUG#24363 If the table structure has been changed, the default action about the restore will fail. · 64b9bda2
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
 - correction of patch, original patch will segfault for print option
```
  64b9bda2
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 36e3a94b
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  36e3a94b
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · ac8592ce
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  ac8592ce
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 07d1f742
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  07d1f742
- 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 tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · c3993ece
  tomas@whalegate.ndb.mysql.com authored Mar 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  c3993ece
- 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 1 commit
- 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