Commits · dd1d46c2cdd19b0113b81f7187d94c68a184f6e2 · Kirill Smelkov / mariadb

17 Aug, 2006 2 commits
- merge warning test results (!) · dd1d46c2
  pgalbraith/patg@govinda.patg.net authored Aug 16, 2006
  
  dd1d46c2
- test result changes (non-functional) for 5.1-5.0 merge · ceb7cb55
  pgalbraith/patg@govinda.patg.net authored Aug 16, 2006
  
  ceb7cb55
16 Aug, 2006 6 commits
- merge 5.0 -> 5.1, re-enabling federated, disabled partition · 370f2241
  pgalbraith/patg@govinda.patg.net authored Aug 16, 2006
  
  370f2241
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b56ff548
  patg@govinda.patg.net authored Aug 16, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
```
  b56ff548
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 79ad722e
  patg@govinda.patg.net authored Aug 16, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
```
  79ad722e
- small fix to enable the test suite to find executables and scripts on Windows · 55165b2f
  reggie@big_geek. authored Aug 16, 2006
  
  55165b2f
- Cheery picked Antony's patch to allow for Window's builds in 5.1 · 183f0286
  brian@zim.(none) authored Aug 15, 2006
  
  183f0286
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ef51164
  ramil/rkalimullin@production.mysql.com authored Aug 16, 2006
```
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
```
  4ef51164
15 Aug, 2006 21 commits
- Merge zim.(none):/home/brian/mysql/dep-5.1 · 8d83366b
  brian@zim.(none) authored Aug 15, 2006
```
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
```
  8d83366b
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 36042d81
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  36042d81
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5c748565
  mskold/marty@linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  5c748565
- Remove building, packing, and installing the "max" server from the RPM "spec" file. · 71be39fa
  joerg@trift2. authored Aug 15, 2006
  
  71be39fa
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 711b5927
  acurtis/antony@xiphis.org/ltantony.xiphis.org authored Aug 15, 2006
```
into  xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild
```
  711b5927
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 67513caf
  pgalbraith/patg@govinda.patg.net authored Aug 15, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
```
  67513caf
- Merge mysql.com:/usr/home/ram/work/tmp_merge · b65bf3b4
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Aug 15, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.0
```
  b65bf3b4
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3b42e84c
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  3b42e84c
- bug #18184 SELECT ... FOR UPDATE does not work..: Updated test result file · 697b89cd
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
  
  697b89cd
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 604f3f8a
  mskold/marty@linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  604f3f8a
- Fix for bug #21059 Server crashes on join query with large dataset with NDB... · c8b93da3
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range
```
  c8b93da3
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 66e82554
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  66e82554
- ndb_lock.test, ndb_lock.result: · 6a3143e2
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
```
  6a3143e2
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · ed6deb3d
  mskold/marty@linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  ed6deb3d
- fix windows build · 4c57a94b
  acurtis/antony@xiphis.org/ltantony.xiphis.org authored Aug 15, 2006
  
  4c57a94b
- Period removal for warning message. · deb37d14
  brian@zim.(none) authored Aug 15, 2006
  
  deb37d14
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · b0510b2c
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  b0510b2c
- ndb_lock.test, ndb_lock.result: · 2d16aa57
  mskold/marty@mysql.com/linux.site authored Aug 15, 2006
```
  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
```
  2d16aa57
- Merge mysql.com:/usr/home/bar/mysql-4.1.b19741 · 9f6c76eb
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Aug 15, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
```
  9f6c76eb
- Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · e2d4aa2c
  acurtis/antony@xiphis.org/ltantony.xiphis.org authored Aug 14, 2006
```
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
```
  e2d4aa2c
- Merge zim.(none):/home/brian/mysql/dep-5.1 · 41f920b0
  brian@zim.(none) authored Aug 14, 2006
```
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
```
  41f920b0
14 Aug, 2006 11 commits
- Merge fixes · 16a5d97a
  brian@zim.(none) authored Aug 14, 2006
  
  16a5d97a
- Merge zim.(none):/home/brian/mysql/dep-5.0 · 8deb5beb
  brian@zim.(none) authored Aug 14, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
  8deb5beb
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 545029df
  brian@zim.(none) authored Aug 14, 2006
```
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
```
  545029df
- Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. · 4d7f7fb8
  brian@zim.(none) authored Aug 14, 2006
  
  4d7f7fb8
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1f80fb04
  kostja@bodhi.local authored Aug 14, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  1f80fb04
- scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages. · a560c3ee
  joerg@trift2. authored Aug 14, 2006
  
  a560c3ee
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · c43a3328
  brian@zim.(none) authored Aug 14, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.0
```
  c43a3328
- Post 5.0engines to 5.1 engines merge fix that didn't make it into that push. · a60a43c2
  patg@govinda.patg.net authored Aug 14, 2006
  
  a60a43c2
- Fix a test case (proper clean up). · d03b39aa
  kostja@bodhi.local authored Aug 14, 2006
  
  d03b39aa
- Fix a test suite failure. · 14e237a9
  kostja@bodhi.local authored Aug 14, 2006
  
  14e237a9
- Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 · 91e94d78
  svoj@may.pils.ru authored Aug 14, 2006
```
into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
```
  91e94d78