Commits · a4934466c07d7867bf0895dc970f3d3504b0be53 · Kirill Smelkov / mariadb

22 May, 2007 3 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · a4934466
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  a4934466
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 2c715f1a
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  2c715f1a
- Bug #28593 cluster backup scans in acc index order, bad for disk data · b46c826a
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
- change to scan in tup and disk order (if applicable)
```
  b46c826a
21 May, 2007 10 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 6ddf4785
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  6ddf4785
- 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 tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f8ac268e
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  f8ac268e
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 672237f5
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  672237f5
- 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 trift2.:/MySQL/M51/mysql-5.1 · 8a0f37d5
  joerg@trift2. authored May 21, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  8a0f37d5
- Prevent the failing "jp" suite from causing havoc in release builds (28563). · bbae855c
  joerg@trift2. authored May 21, 2007
  
  bbae855c
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · ffe2982b
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  ffe2982b
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a2b2bbd9
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  a2b2bbd9
20 May, 2007 1 commit
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1 · a61c5f77
  holyfoot/hf@hfmain.(none) authored May 20, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  a61c5f77
19 May, 2007 5 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 55cdaa7e
  msvensson@pilot.blaudden authored May 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
```
  55cdaa7e
- Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · a5186466
  msvensson@pilot.blaudden authored May 19, 2007
```
 - Upgrade result file for 5.1
```
  a5186466
- 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
- Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 · 45c202a3
  msvensson@pilot.blaudden authored May 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/bug28401/my51-bug28401
```
  45c202a3
- 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 21 commits
- merging · e04000ec
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
  
  e04000ec
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 44331376
  holyfoot/hf@hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  44331376
- 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
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · e2abd12b
  holyfoot/hf@hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  e2abd12b
- Merge bk@192.168.21.1:mysql-5.1 · 783c7071
  holyfoot/hf@hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  783c7071
- Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 093b0deb
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  093b0deb
- Merge bk@192.168.21.1:mysql-5.0 · 8b21517d
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  8b21517d
- Merge bk@192.168.21.1:mysql-4.1 · 38c8951d
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
  38c8951d
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 85d5dfed
  holyfoot/hf@hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  85d5dfed
- Merge bk-internal:/home/bk/mysql-5.1-maint · cdef9208
  msvensson@pilot.blaudden authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
```
  cdef9208
- Merge bk-internal:/home/bk/mysql-5.0-maint · 01ae0807
  msvensson@pilot.blaudden authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  01ae0807
- Merge bk-internal:/home/bk/mysql-4.1-maint · 7bc79da2
  msvensson@pilot.blaudden authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  7bc79da2
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cea88605
  msvensson@pilot.blaudden authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
```
  cea88605
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · c3f407a0
  msvensson@pilot.blaudden authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  c3f407a0
- WL#2247 mysqltest: add option for sorting results · e05aa943
  msvensson@pilot.blaudden authored May 18, 2007
```
 - Final touchups
```
  e05aa943
- Merge trift2.:/MySQL/M50/push-5.0 · 4c11cf2d
  joerg@trift2. authored May 18, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  4c11cf2d
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 835189cb
  evgen@moonbone.local authored May 18, 2007
```
into  moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
```
  835189cb
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · be3342cf
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  be3342cf
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 2c60a173
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  2c60a173