Commits · 5c748565dce95f3b1689ff3e3159ea7902aeff5a · Kirill Smelkov / mariadb

15 Aug, 2006 10 commits
- 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
- 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
- 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
14 Aug, 2006 13 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 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
- 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
- Fix for bug#20648 We introduce a new field method for knowing "real size", and... · 7429c871
  brian@zim.(none) authored Aug 14, 2006
```
Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 
```
  7429c871
- Manual merge 5.0->5.1. Post-merge fixes. · 5dfdc8bf
  kostja@bodhi.local authored Aug 14, 2006
  
  5dfdc8bf
12 Aug, 2006 1 commit
- Merge bodhi.local:/opt/local/work/tmp_merge · 04c97488
  kostja@bodhi.local authored Aug 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  04c97488
11 Aug, 2006 2 commits
- Extended a test case for bug#7391. · 07a1ed65
  svoj@may.pils.ru authored Aug 11, 2006
  
  07a1ed65
- Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1 · 82716491
  svoj@may.pils.ru authored Aug 11, 2006
```
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0
```
  82716491
10 Aug, 2006 13 commits
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · b2ce951b
  pgalbraith/patg@govinda.patg.net authored Aug 10, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
```
  b2ce951b
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 43717499
  patg@govinda.patg.net authored Aug 10, 2006
```
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
```
  43717499
- Merge updates. · f6f7eb85
  cmiller@zippy.cornsilk.net authored Aug 10, 2006
  
  f6f7eb85
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge · b341356a
  kroki/tomash@moonlight.intranet authored Aug 10, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
```
  b341356a
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge · aca2c376
  kroki/tomash@moonlight.intranet authored Aug 10, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
```
  aca2c376
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge · ed42379c
  kroki/tomash@moonlight.intranet authored Aug 10, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
```
  ed42379c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 069131e2
  serg@janus.mylan authored Aug 10, 2006
```
into  janus.mylan:/usr/home/serg/Abk/m51
```
  069131e2
- revert part of the code · 81efea72
  andrey@example.com authored Aug 10, 2006
```
how did it get in?!? (it's only in local csets so no other tree is affected)
```
  81efea72
- after merge update · eba91092
  andrey@example.com authored Aug 10, 2006
  
  eba91092
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 7d77c530
  serg@janus.mylan authored Aug 10, 2006
```
into janus.mylan:/usr/home/serg/Abk/m51
```
  7d77c530
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 · f6dda7f1
  kroki/tomash@moonlight.intranet authored Aug 10, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
```
  f6dda7f1
- Removed Iggy's accidentally-added files. · 364dfae6
  cmiller@zippy.cornsilk.net authored Aug 10, 2006
  
  364dfae6
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 · 543fcde9
  cmiller@zippy.cornsilk.net authored Aug 09, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
```
  543fcde9
09 Aug, 2006 1 commit
- sql_base.cc, table.cc: · 2e7f47c6
  evgen@moonbone.local authored Aug 10, 2006
```
  After merge fix
```
  2e7f47c6