Commits · d29eaed81a1c2847708dcd62c2971a4f4f9d4df6 · nexedi / MariaDB

24 May, 2007 1 commit
- 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
23 May, 2007 4 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
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 21 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
- 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 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-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 perch.ndb.mysql.com:/home/jonas/src/41-work · 990c584e
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
```
  990c584e
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · c50adc26
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  c50adc26
- 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/41-work · aa2d7a3f
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  aa2d7a3f
- ndb - bug#28443 · 3019b648
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
  review comment 2, atleast 1 signal need for test prg
```
  3019b648
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 01bace04
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  01bace04
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 0cca7278
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  0cca7278
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 91f3074e
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
```
  91f3074e
- ndb - bug#28443 · b9fd34a9
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
  review comment
  if some tcp-transporter has data, then do select with timeout 0
```
  b9fd34a9
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a083748c
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  a083748c
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · db6f4643
  jonas@perch.ndb.mysql.com authored May 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
```
  db6f4643