Commits · cf76884b38917ca685c7d44f891163ac70b16acb · Kirill Smelkov / mariadb

18 Aug, 2006 2 commits
- Fix for the failing gis.test · cf76884b
  holyfoot/hf@mysql.com/deer.(none) authored Aug 18, 2006
  
  cf76884b
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d094b5f2
  rburnett@bk-internal.mysql.com authored Aug 18, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  d094b5f2
17 Aug, 2006 7 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 4b7e3775
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  4b7e3775
- A couple of adjustments to the merge to fix the broken build · 284fa931
  rburnett@production.mysql.com authored Aug 17, 2006
```
instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*
```
  284fa931
- rename to avoid case sensitive collision · 9d531c4f
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
  
  9d531c4f
- Merge bk-internal.mysql.com:/data0/bk/tmp_reg · d65095b4
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
```
  d65095b4
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 1bfe7668
  rburnett@bk-internal.mysql.com authored Aug 17, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  1bfe7668
- 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 12 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
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 38a36da8
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  38a36da8
- small fix to enable the test suite to find executables and scripts on Windows · 55165b2f
  reggie@big_geek. authored Aug 16, 2006
  
  55165b2f
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt · 92aa3bae
  gluh@gluh.(none) authored Aug 16, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-kt
```
  92aa3bae
- Bug#20871 Partitions: crash if --skip-innodb · a9b18171
  gluh@mysql.com/gluh.(none) authored Aug 16, 2006
```
return error if engine is disabled
```
  a9b18171
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 8baecf7e
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  8baecf7e
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f23643cc
  rburnett@bk-internal.mysql.com authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  f23643cc
- Merge bk@192.168.21.1:mysql-5.0-kt · c965eea7
  holyfoot/hf@mysql.com/deer.(none) authored Aug 16, 2006
```
into  mysql.com:/home/hf/work/mysql-5.0.20910
```
  c965eea7
- 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 19 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 bk-internal.mysql.com:/data0/bk/mysql-5.1 · 344dd037
  rburnett@bk-internal.mysql.com authored Aug 15, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  344dd037
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 8d5e2dd6
  rburnett@bk-internal.mysql.com authored Aug 15, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
  8d5e2dd6
- 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 bk@192.168.21.1:mysql-5.0-kt · 81764f89
  holyfoot/hf@mysql.com/deer.(none) authored Aug 15, 2006
```
into  mysql.com:/home/hf/work/mysql-5.0.20910
```
  81764f89
- 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