Commits · f1898c0569d900e3eb3aee2848afb1ed89dc927a · Kirill Smelkov / mariadb

25 Apr, 2007 12 commits
- Merge bk-internal:/home/bk/mysql-5.1-new-ndb · f1898c05
  knielsen@ymer.(none) authored Apr 25, 2007
```
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
```
  f1898c05
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e5fb1acd
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  e5fb1acd
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 138264ac
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  138264ac
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 7d63b2d1
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
```
  7d63b2d1
- ndb: added some retry sleep to not get busy loops · 0183b3d3
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
  
  0183b3d3
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · c1d0bbbb
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  c1d0bbbb
- Bug #28093 ndb: retry sleep in get table stats 30s instead of 30ms · 0ac443ef
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
  
  0ac443ef
- Merge bk-internal:/home/bk/mysql-5.1-new-ndb · 2c655243
  knielsen@ymer.(none) authored Apr 25, 2007
```
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
```
  2c655243
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · be343dc7
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  be343dc7
- After-merge fixes. · 45e18df8
  knielsen@ymer.(none) authored Apr 25, 2007
  
  45e18df8
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 1e3938b9
  tomas@whalegate.ndb.mysql.com authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  1e3938b9
- 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
24 Apr, 2007 28 commits
- Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 14cf7336
  stewart@willster.(none) authored Apr 24, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
```
  14cf7336
- Bug #24228 ndb_size.pl requires non-standard HTML::Template module · 14ff8874
  stewart@willster.(none) authored Apr 24, 2007
```
Bug #24227  	ndb_size.pl should report default values instead of < default for config params
Bug #24229  	ndb_size.pl doesn't compute Index usage correctly

Big ndb_size.pl update
```
  14ff8874
- - 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 tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c6377e66
  tomas@whalegate.ndb.mysql.com authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  c6377e66
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 6654cc8a
  tomas@whalegate.ndb.mysql.com authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  6654cc8a
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 64d2bea6
  tomas@whalegate.ndb.mysql.com authored Apr 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  64d2bea6
- 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
- Added missing backslash · f7098f76
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
  
  f7098f76
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · cabef956
  mskold/marty@linux.site authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  cabef956
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · fb6b0708
  mskold/marty@linux.site authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  fb6b0708
- ha_ndbcluster.h, ha_ndbcluster.cc: · eaba3f25
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
```
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge
```
  eaba3f25
- 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 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 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
- Moved method definition to ease merge to 5.1 · 25ecc738
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
  
  25ecc738
- 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:/windows/Linux_space/MySQL/mysql-5.0-ndb · b4b9a326
  mskold/marty@linux.site authored Apr 24, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  b4b9a326
- Back-ported compiler warning fixes from 5.1 to ease merging · c68a4c9c
  mskold/marty@mysql.com/linux.site authored Apr 24, 2007
  
  c68a4c9c