Commits · 11c834516621cbacf292d437cd708b829ebd8dfb · Kirill Smelkov / mariadb

31 May, 2007 9 commits
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 11c83451
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  11c83451
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 20661e63
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  20661e63
- fix test case · 6e7585a0
  df@pippilotta.erinye.com authored May 31, 2007
  
  6e7585a0
- fixed not matching if/endif (cmake) · 9a151eb3
  georg@bing.mysql.com authored May 31, 2007
  
  9a151eb3
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 5d77288d
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  5d77288d
- fix test case broken for ps-protocol by previous push · fc1e0388
  df@pippilotta.erinye.com authored May 31, 2007
  
  fc1e0388
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 898b3319
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  898b3319
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 82dc9136
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
```
  82dc9136
- some test cases cannot run with --skip-log-bin · 779a055e
  df@pippilotta.erinye.com authored May 31, 2007
  
  779a055e
30 May, 2007 4 commits
- Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build · a1f0ff4b
  kent@kent-amd64.(none) authored May 30, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
```
  a1f0ff4b
- Makefile.am, configure.in: · b217a9e8
  kent@mysql.com/kent-amd64.(none) authored May 30, 2007
```
  Added --with-mysqld-libs configure flag
```
  b217a9e8
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707 · 407224f4
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  407224f4
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 3b4fca2a
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  3b4fca2a
29 May, 2007 2 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work-17707 · 82669a37
  df@pippilotta.erinye.com authored May 29, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707
```
  82669a37
- BUG#17707 check-cpu script doesn't include Turion · 1db91f16
  df@pippilotta.erinye.com authored May 29, 2007
  
  1db91f16
24 May, 2007 3 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · d5422980
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  d5422980
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · d29eaed8
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  d29eaed8
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 918d90d5
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  918d90d5
23 May, 2007 5 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42 · a70903b7
  df@pippilotta.erinye.com authored May 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  a70903b7
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines · 43b2dc18
  svoj@june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  43b2dc18
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 122167bb
  svoj@mysql.com/june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  122167bb
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · a4ddc226
  svoj@mysql.com/june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
```
  a4ddc226
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · f8433465
  df@pippilotta.erinye.com authored May 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  f8433465
22 May, 2007 6 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · b7894527
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  b7894527
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 481b314e
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  481b314e
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 7b2c430f
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
  7b2c430f
- Merge trift2.:/MySQL/M50/bug26609-5.0 · b8e3fb13
  joerg@trift2. authored May 22, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  b8e3fb13
- Add the "row_lock" test suite to the (to be) release build test run. · 11850044
  joerg@trift2. authored May 22, 2007
  
  11850044
- scripts/make_binary_distribution.sh : · b0677f1d
  joerg@trift2. authored May 22, 2007
```
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
```
  b0677f1d
21 May, 2007 6 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · b3a84ddd
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  b3a84ddd
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 99488b31
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  99488b31
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · 2c3bebc5
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
```
  2c3bebc5
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 709cfbc1
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  709cfbc1
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 11feedf0
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  11feedf0
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 9f1cba8e
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
  9f1cba8e
19 May, 2007 2 commits
- Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 · a3bd5884
  msvensson@pilot.blaudden authored May 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  a3bd5884
- Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · bc69d072
  msvensson@pilot.blaudden authored May 19, 2007
```
 - The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.
```
  bc69d072
18 May, 2007 3 commits
- Merge bk@192.168.21.1:mysql-5.0-opt · d5685d4c
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  d5685d4c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c7a45473
  serg@sergbook.mysql.com authored May 18, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
```
  c7a45473
- added cleanup to some tests · 11e5fa8f
  serg@sergbook.mysql.com authored May 18, 2007
  
  11e5fa8f