Commits · 38ce0fc24d88d6234c07e795421e60f3a6332b35 · nexedi / MariaDB

30 Oct, 2007 3 commits
- correct result file · 38ce0fc2
  tomas@whalegate.ndb.mysql.com authored Oct 30, 2007
  
  38ce0fc2
- correct manual merge · b0e90a43
  tomas@whalegate.ndb.mysql.com authored Oct 30, 2007
  
  b0e90a43
- Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · a214b1b9
  tomas@whalegate.ndb.mysql.com authored Oct 30, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  a214b1b9
29 Oct, 2007 1 commit
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · e3f77622
  gluh@eagle.(none) authored Oct 29, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  e3f77622
26 Oct, 2007 2 commits
- correct unused code · 93c95156
  tomas@whalegate.ndb.mysql.com authored Oct 26, 2007
  
  93c95156
- commit of WL#3686 test case already in 5.1 to get regression testing, no code committed · 39b1aaed
  tomas@whalegate.ndb.mysql.com authored Oct 26, 2007
  
  39b1aaed
25 Oct, 2007 8 commits
- Mimic a rename which Daniel already did in 6.0, · 00ca6476
  joerg@trift2. authored Oct 25, 2007
```
to get rid of a name clash among *deleted* files on case-insignificant file systems.
```
  00ca6476
- Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb · bb6346fd
  knielsen@loke.(none) authored Oct 25, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
```
  bb6346fd
- Merge loke.(none):/home/knielsen/devel/bug31810 · b77f44c7
  knielsen@loke.(none) authored Oct 25, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb
```
  b77f44c7
- Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca · 328fc573
  knielsen@loke.(none) authored Oct 25, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
```
  328fc573
- Merge loke.(none):/home/knielsen/devel/bug31761 · 815a6300
  knielsen@loke.(none) authored Oct 25, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
```
  815a6300
- Merge loke.(none):/home/knielsen/devel/bug31761 · 75a5c28d
  knielsen@loke.(none) authored Oct 25, 2007
```
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb
```
  75a5c28d
- BUG#31810: Potential infinite loop with autoincrement failures in ndb · e16f03cd
  knielsen@loke.(none)[knielsen] authored Oct 25, 2007
```
Fix extra semicolon causing if-statement to be disabled.
```
  e16f03cd
- BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc · a7f78755
  knielsen@loke.(none)[knielsen] authored Oct 25, 2007
```
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.

Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
```
  a7f78755
24 Oct, 2007 4 commits
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · d850b107
  mskold/marty@linux.site authored Oct 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  d850b107
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 588b05d5
  mskold/marty@linux.site authored Oct 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  588b05d5
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 4785c573
  mskold/marty@linux.site authored Oct 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  4785c573
- result fix · 97e0180b
  gluh@mysql.com/eagle.(none) authored Oct 24, 2007
  
  97e0180b
23 Oct, 2007 22 commits
- result fix · b2aeda76
  gluh@mysql.com/eagle.(none) authored Oct 23, 2007
  
  b2aeda76
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · d6397390
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  d6397390
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 53b1c3a2
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  53b1c3a2
- after merge fix · 1d42094d
  gluh@mysql.com/eagle.(none) authored Oct 23, 2007
  
  1d42094d
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 17acda6c
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  17acda6c
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 237383f0
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  237383f0
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 331ee712
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  331ee712
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d0f53297
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  d0f53297
- Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 17310895
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  17310895
- Merge mysql.com:/home/hf/work/30638/my50-30638 · f71a1441
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  f71a1441
- Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 6f1aef60
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
  6f1aef60
- Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · 6832d2cc
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
  6832d2cc
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9934eec2
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  9934eec2
- Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 23c65a3b
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  23c65a3b
- Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 17a533e0
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
```
  17a533e0
- type conversions fixed to get rid of warnings · d029dd89
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  d029dd89
- Merge mysql.com:/home/hf/work/30638/my50-30638 · 05f918e9
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  05f918e9
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 9b61281c
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  9b61281c
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 58bce232
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
```
  58bce232
- merge 5.0-opt -> 5.1-opt for bug 30825 · 7ac179bc
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
  
  7ac179bc
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bc80b863
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  bc80b863
- Merge mysql.com:/home/hf/work/30638/my50-30638 · c3033ace
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  c3033ace