Commits · 82e942ef9782c2626929bb2c56a721467f1a77a0 · Kirill Smelkov / mariadb

17 Aug, 2006 1 commit
- merge fix · 82e942ef
  mikael/pappa@dator5.(none) authored Aug 17, 2006
  
  82e942ef
16 Aug, 2006 10 commits
- Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt · b738fd4d
  mikael/pappa@dator5.(none) authored Aug 16, 2006
```
into  dator5.(none):/home/pappa/bug21388
```
  b738fd4d
- 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 dator5.(none):/home/pappa/bug21357 · 2c64f1d1
  mikael/pappa@dator5.(none) authored Aug 16, 2006
```
into  dator5.(none):/home/pappa/bug21388
```
  2c64f1d1
- Merge dator5.(none):/home/pappa/bug21143 · a6df8abf
  mikael/pappa@dator5.(none) authored Aug 16, 2006
```
into  dator5.(none):/home/pappa/bug21388
```
  a6df8abf
- Merge dator5.(none):/home/pappa/bug21173 · 8d8b2b38
  mikael/pappa@dator5.(none) authored Aug 16, 2006
```
into  dator5.(none):/home/pappa/bug21388
```
  8d8b2b38
- Merge dator5.(none):/home/pappa/bug15890 · 142af8c2
  mikael/pappa@dator5.(none) authored Aug 16, 2006
```
into  dator5.(none):/home/pappa/bug21388
```
  142af8c2
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 9ba77eb8
  mikael/pappa@dator5.(none) authored Aug 16, 2006
```
into  dator5.(none):/home/pappa/bug21388
```
  9ba77eb8
- 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
- Cheery picked Antony's patch to allow for Window's builds in 5.1 · 183f0286
  brian@zim.(none) authored Aug 15, 2006
  
  183f0286
15 Aug, 2006 14 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.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 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
- 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
- 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 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 15 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
- Fix a test case (proper clean up). · d03b39aa
  kostja@bodhi.local authored Aug 14, 2006
  
  d03b39aa
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c189be68
  rburnett@bk-internal.mysql.com authored Aug 14, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  c189be68
- 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
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9b05865b
  kostja@bodhi.local authored Aug 14, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  9b05865b
- Windows build fix: declare _db_set_ before it's used. · d4a7b82b
  kostja@bodhi.local authored Aug 14, 2006
  
  d4a7b82b
- BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 · d4bdba17
  svoj@may.pils.ru authored Aug 14, 2006
```
Fixed by moving update_key_parts() down to be after write_index().
```
  d4bdba17
- Merge romeo.(none):/home/bkroot/mysql-5.1-new-maint · 7a1ccf90
  mats@romeo.(none) authored Aug 14, 2006
```
into  romeo.(none):/home/bk/mytap-mysql-5.1-new-maint
```
  7a1ccf90