Commits · c0d1f9fd46e6d31b70f16d6bb9445927d6cb039c · Kirill Smelkov / mariadb

22 Mar, 2007 2 commits
- 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 21 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
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · a0c2fae0
  msvensson@pilot.blaudden authored Mar 21, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  a0c2fae0
- Merge bk-internal:/home/bk/mysql-5.0-maint · 31b2f339
  msvensson@pilot.blaudden authored Mar 21, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  31b2f339
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 7c5df4d3
  msvensson@pilot.blaudden authored Mar 21, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  7c5df4d3
- Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build · 79216dad
  aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi authored Mar 21, 2007
```
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
```
  79216dad
- Merge... · ac1c81dd
  aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi authored Mar 21, 2007
```
Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
```
  ac1c81dd
- mysqlbinlog-cp932.test: · 9d4a0118
  holyfoot/abotchkov@mysql.com/bk-internal.mysql.com authored Mar 21, 2007
```
  merging
```
  9d4a0118
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 · 2553b476
  tsmith@quadxeon.mysql.com authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  2553b476
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 1907df76
  tsmith@quadxeon.mysql.com authored Mar 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
  1907df76
20 Mar, 2007 17 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-release · 031fd30d
  kent@mysql.com/kent-amd64.(none) authored Mar 21, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  031fd30d
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 3bf2a522
  msvensson@pilot.blaudden authored Mar 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  3bf2a522
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 · af196906
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  af196906
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 · cc4ea8bb
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
  cc4ea8bb
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 9167aaba
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  9167aaba
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 8f3d9cb4
  msvensson@pilot.blaudden authored Mar 20, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  8f3d9cb4
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d21bf445
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/test-help-5.1
```
  d21bf445
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 7018d9c5
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  7018d9c5
- Merge trift2.:/MySQL/M50/test-help-5.0 · 16ec3cb3
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M51/test-help-5.1
```
  16ec3cb3
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 2250d1a7
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
```
  2250d1a7
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · fb5e4d32
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
  fb5e4d32
- Post Merge Fix. · 13398ccb
  iggy@recycle.(none) authored Mar 20, 2007
  
  13398ccb
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 2670f149
  tsmith@quadxeon.mysql.com authored Mar 20, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
```
  2670f149
- Merge trift2.:/MySQL/M41/test-help-4.1 · 602ed0a9
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M50/test-help-5.0
```
  602ed0a9
- Remove the variables for long gone disable_ps_warnings · 5b62c51a
  msvensson@pilot.blaudden authored Mar 20, 2007
  
  5b62c51a
- Test "help": · 69a2dcda
  joerg@trift2. authored Mar 20, 2007
```
Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.
```
  69a2dcda
- Merge trift2.:/MySQL/M41/test-help-4.1 · 54dd7a51
  joerg@trift2. authored Mar 20, 2007
```
into  trift2.:/MySQL/M50/test-help-5.0
```
  54dd7a51