Commits · d6db96fb55847b42707ca65bdafe999ccf961794 · Kirill Smelkov / mariadb

24 Sep, 2007 1 commit
- Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0 · d6db96fb
  jperkin@production.mysql.com authored Sep 24, 2007
```
into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1
```
  d6db96fb
22 Sep, 2007 1 commit
- Revert previous attempt to fix bug#27693, the files removed from the · 3b3be2ad
  jonathan@bagpuss.adsl.perkin.org.uk authored Sep 22, 2007
```
cmake list are auto-generated and thus still required.  Correct fix
not yet known.
```
  3b3be2ad
14 Sep, 2007 13 commits
- Merge trift2.:/MySQL/M50/push-5.0 · f724efee
  joerg@trift2. authored Sep 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  f724efee
- Merge trift2.:/MySQL/M41/push-4.1 · 0cdf470a
  joerg@trift2. authored Sep 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  0cdf470a
- Merge trift2.:/MySQL/M51/mysql-5.1 · 8fd3d711
  joerg@trift2. authored Sep 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  8fd3d711
- Merge trift2.:/MySQL/M50/mysql-5.0 · 100f6915
  joerg@trift2. authored Sep 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  100f6915
- Merge trift2.:/MySQL/M41/mysql-4.1 · e7851316
  joerg@trift2. authored Sep 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  e7851316
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 0f36ce8f
  tomas@whalegate.ndb.mysql.com authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  0f36ce8f
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 75899935
  tomas@whalegate.ndb.mysql.com authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  75899935
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 7cf77f49
  tomas@whalegate.ndb.mysql.com authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  7cf77f49
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 965124b4
  tomas@whalegate.ndb.mysql.com authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  965124b4
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 54adc4ee
  tomas@whalegate.ndb.mysql.com authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  54adc4ee
- Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 0b7e4b4d
  gshchepa/uchum@gleb.loc authored Sep 14, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
  0b7e4b4d
- Merge gleb.loc:/home/uchum/work/bk/5.1 · aac756e4
  gshchepa/uchum@gleb.loc authored Sep 14, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
  aac756e4
- Merge gleb.loc:/home/uchum/work/bk/5.0 · 7284a865
  gshchepa/uchum@gleb.loc authored Sep 14, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.0-opt
```
  7284a865
13 Sep, 2007 10 commits
- Merge trift2.:/MySQL/M50/tmp-5.0 · b0fb8aa3
  joerg@trift2. authored Sep 13, 2007
```
into  trift2.:/MySQL/M51/tmp-5.1
```
  b0fb8aa3
- Merge trift2.:/MySQL/M51/push-5.1 · 6a67761b
  joerg@trift2. authored Sep 13, 2007
```
into  trift2.:/MySQL/M51/tmp-5.1
```
  6a67761b
- Merge trift2.:/MySQL/M50/push-5.0 · 1dc3246f
  joerg@trift2. authored Sep 13, 2007
```
into  trift2.:/MySQL/M50/tmp-5.0
```
  1dc3246f
- Merge gleb.loc:/home/uchum/work/bk/5.0-opt · a9dd53ab
  gshchepa/uchum@gleb.loc authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
  a9dd53ab
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · f2159e2d
  mskold/marty@linux.site authored Sep 13, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  f2159e2d
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · d4e84e13
  mskold/marty@linux.site authored Sep 13, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  d4e84e13
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · 2ea6d3d6
  mskold/marty@linux.site authored Sep 13, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  2ea6d3d6
- bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments · 44b6c2ed
  mskold/marty@mysql.com/linux.site authored Sep 13, 2007
  
  44b6c2ed
- Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2e7306d5
  gshchepa/uchum@gleb.loc authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.0-opt
```
  2e7306d5
- Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 2a3facc3
  gshchepa/uchum@gleb.loc authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
  2a3facc3
12 Sep, 2007 14 commits
- sql_view.cc: · 321c172e
  gshchepa/uchum@gleb.loc authored Sep 13, 2007
```
  Post-merge fix.
```
  321c172e
- Merge gleb.loc:/home/uchum/work/bk/5.1 · bd4fd047
  gshchepa/uchum@gleb.loc authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
  bd4fd047
- Merge gleb.loc:/home/uchum/work/bk/5.0 · ff042427
  gshchepa/uchum@gleb.loc authored Sep 12, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.0-opt
```
  ff042427
- Better wording in comments · 1ff0caf4
  sergefp@mysql.com authored Sep 12, 2007
  
  1ff0caf4
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 5b0e532d
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  5b0e532d
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 59e502dc
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  59e502dc
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · df552c31
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  df552c31
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj · f0f025f9
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
```
  f0f025f9
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 63648db4
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
```
  63648db4
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 83eed4d8
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
```
  83eed4d8
- BUG#23354 revert · 461a3dcc
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
  
  461a3dcc
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · ae46c7e5
  gshchepa@bk-internal.mysql.com authored Sep 12, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
```
  ae46c7e5
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · c484d9c5
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  c484d9c5
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · f1674d1b
  tomas@whalegate.ndb.mysql.com authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  f1674d1b
11 Sep, 2007 1 commit
- Post-merge fixes · 06f12f66
  sergefp@mysql.com authored Sep 12, 2007
  
  06f12f66