Commits · f4fed734c6d0dc8eec3c4c3b120b7d0c37879392 · nexedi / MariaDB

23 Mar, 2007 5 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user · f4fed734
  tomas@whalegate.ndb.mysql.com authored Mar 23, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  f4fed734
- correction of merge · 8823a1a2
  tomas@whalegate.ndb.mysql.com authored Mar 23, 2007
  
  8823a1a2
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · 9899df36
  tomas@whalegate.ndb.mysql.com authored Mar 23, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
```
  9899df36
- Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes · 29ac950b
  tomas@whalegate.ndb.mysql.com authored Mar 23, 2007
  
  29ac950b
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 05984c7a
  tomas@whalegate.ndb.mysql.com authored Mar 23, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  05984c7a
22 Mar, 2007 22 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e44d030b
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  e44d030b
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 424f82d3
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  424f82d3
- BUG#27044 bug fix of 27320 fixes this, added test case · f7e44284
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
  
  f7e44284
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · fcbdc84a
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  fcbdc84a
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · cb4d64ad
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  cb4d64ad
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 8791870d
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
```
  8791870d
- Bug #27320 ndb handler does not reset extra flags on reset() · a449d1de
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
- make sure all extra flags are reset
```
  a449d1de
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · d645496e
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  d645496e
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · ca05bbf9
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  ca05bbf9
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 05a8790f
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  05a8790f
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 4a1c8d29
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  4a1c8d29
- ndb - · 155e3d11
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
  fix testprg
```
  155e3d11
- ndb - fix test prg · 0e1974d2
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
  
  0e1974d2
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · b402e124
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  b402e124
- ndb - · 702b5dad
  jonas@perch.ndb.mysql.com authored Mar 22, 2007
```
  fix test prg
```
  702b5dad
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 47834f39
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  47834f39
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8b964c2b
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  8b964c2b
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 753bc96e
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  753bc96e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6e7528bd
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  6e7528bd
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6bab2f13
  tomas@whalegate.ndb.mysql.com authored Mar 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  6bab2f13
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · c0d1f9fd
  tsmith@quadxeon.mysql.com authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  c0d1f9fd
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 54e7bc8d
  tsmith@quadxeon.mysql.com authored Mar 22, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  54e7bc8d
21 Mar, 2007 13 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 4981d459
  tsmith@quadxeon.mysql.com authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  4981d459
- Update the result file with an updated comment. · f017117d
  kostja@bodhi.local authored Mar 22, 2007
  
  f017117d
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 9279170e
  kostja@bodhi.local authored Mar 22, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  9279170e
- Try to fix events_logs_tests race on Windows. · 54076b30
  kostja@bodhi.local authored Mar 22, 2007
  
  54076b30
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 95597c83
  kostja@bodhi.local authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  95597c83
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c011a25f
  kostja@bodhi.local authored Mar 21, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  c011a25f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c1e6a4c4
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my50-bug27144
```
  c1e6a4c4
- Merge recycle.(none):/src/bug27144/my50-bug27144 · 762eae0b
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug27144/my51-bug27144
```
  762eae0b
- Bug#27144 sp-destruct.test is disabled on Windows · a763917a
  iggy@recycle.(none) authored Mar 21, 2007
```
- Update test to run properly on Windows.
```
  a763917a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9800fbf0
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my50-bug23736
```
  9800fbf0
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 0d3aefcd
  iggy@recycle.(none) authored Mar 21, 2007
```
into  recycle.(none):/src/bug23736/my51-bug23736
```
  0d3aefcd
- Fix warnings on Windows. · 102f298a
  kostja@bodhi.local authored Mar 21, 2007
  
  102f298a
- Fix a broken merge. · 39eafdd8
  kostja@bodhi.local authored Mar 21, 2007
  
  39eafdd8