Commits · 667cb179421d6f3b9723fd3f65778ca6e8b50494 · Kirill Smelkov / mariadb

26 Apr, 2007 1 commit
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 667cb179
  msvensson@pilot.blaudden authored Apr 26, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  667cb179
25 Apr, 2007 9 commits
- Add --symbolic-links=1 for partition_not_windows-master.opt. · c6f625bd
  tsmith@quadxeon.mysql.com authored Apr 25, 2007
  
  c6f625bd
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · da7bda45
  tsmith@quadxeon.mysql.com authored Apr 25, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  da7bda45
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · 9e4cc9e3
  tsmith@quadxeon.mysql.com authored Apr 25, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  9e4cc9e3
- Fix for valgrind errors in test: require symlink support for partition_not_windows.test · 43b4b044
  tsmith@quadxeon.mysql.com authored Apr 25, 2007
  
  43b4b044
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 9f1aac76
  msvensson@pilot.blaudden authored Apr 25, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  9f1aac76
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · b99fbce5
  msvensson@pilot.blaudden authored Apr 25, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  b99fbce5
- Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262 · 6e4acae6
  msvensson@pilot.blaudden authored Apr 25, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  6e4acae6
- thread_registry.cc: · d343965f
  mjorgensen@blade09.mysql.com authored Apr 25, 2007
```
  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed
```
  d343965f
- Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my51-bug25262 · 5fdd4112
  msvensson@pilot.blaudden authored Apr 25, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  5fdd4112
24 Apr, 2007 26 commits
- - Resolved conflict between fixes for bugs 25141 and 26074. · 08ea692a
  iggy@recycle.(none) authored Apr 24, 2007
```
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
```
  08ea692a
- - Removing mistake. · 0dfb49b0
  iggy@recycle.(none) authored Apr 24, 2007
  
  0dfb49b0
- Cset exclude: iggy@alf.|ChangeSet|20070330021852|19466 · 8e11fe89
  iggy@recycle.(none) authored Apr 24, 2007
  
  8e11fe89
- Merge alf.:D:/src/mysql-5.1-maint · b2bf1935
  iggy@alf. authored Apr 24, 2007
```
into  alf.:D:/src/mysql-5.1-maint_pt
```
  b2bf1935
- Minor fixes. · 0f43ac0d
  iggy@alf. authored Apr 24, 2007
  
  0f43ac0d
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · b841154e
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  b841154e
- Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118 · 9bd17ef1
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  9bd17ef1
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 8bbdc58b
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  8bbdc58b
- Merge bk-internal:/home/bk/mysql-5.0-maint · 88ad41e2
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  88ad41e2
- Merge mysql.com:/home/ram/work/mysql-4.1-maint · 1d0f9bed
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.4.1
```
  1d0f9bed
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 45631375
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  45631375
- Merge mysql.com:/home/ram/work/mysql-4.1-maint · 250ae972
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.4.1
```
  250ae972
- Merge bk-internal:/home/bk/mysql-5.0-maint · ffd0d33f
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  ffd0d33f
- Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 · f028e17a
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  f028e17a
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · d4cb37e8
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  d4cb37e8
- Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade · a4ee7302
  msvensson@pilot.blaudden authored Apr 24, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  a4ee7302
- Merge mysql.com:/home/ram/work/mysql-5.0-maint · 49b18703
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.5.0
```
  49b18703
- after-merge fix · 244c1923
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
  
  244c1923
- Merge mysql.com:/home/ram/work/b27515/b27515.5.0 · 3935e224
  ramil/ram@ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.5.1
```
  3935e224
- after-merge fix · d1386154
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
  
  d1386154
- Merge mysql.com:/home/ram/work/b27515/b27515.4.1 · bb3b6ae7
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Apr 24, 2007
```
into  mysql.com:/home/ram/work/b27515/b27515.5.0
```
  bb3b6ae7
- Merge alf.:D:/src/mysql-5.1-maint · 2c955476
  iggy@alf. authored Apr 23, 2007
```
into  alf.:D:/src/mysql-5.1-maint_pt
```
  2c955476
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 45400e5c
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
  45400e5c
- Post Merge Correction · f4569bd5
  iggy@recycle.(none) authored Apr 23, 2007
  
  f4569bd5
- Merge recycle.(none):/src/bug24732/my50-bug24732 · b118b412
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my51-bug24732
```
  b118b412
- Bug#24732 Executables do not include Vista manifests · 5cf93071
  iggy@recycle.(none) authored Apr 23, 2007
```
- Correct PushBuild failure.
```
  5cf93071
23 Apr, 2007 4 commits
- Merge recycle.(none):/src/mysql-5.1-maint · e251139c
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_25141
```
  e251139c
- Merge recycle.(none):/src/mysql-5.1-maint · ba01167c
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/mysql-5.1-maint_27691
```
  ba01167c
- Bug #27691 bk compilation with VC++ 2005 fails · 4bde20d1
  iggy@recycle.(none) authored Apr 23, 2007
```
- Added appropiate casts.
```
  4bde20d1
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4a50d613
  iggy@recycle.(none) authored Apr 23, 2007
```
into  recycle.(none):/src/bug24732/my50-bug24732
```
  4a50d613