Commits · 17218bd7327cae89ad8b422eb69019cb5507a7dd · nexedi / MariaDB

21 Sep, 2006 5 commits
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17218bd7
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  17218bd7
- Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. · d1f0a57a
  joerg@trift2. authored Sep 21, 2006
  
  d1f0a57a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 64fbabc5
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  64fbabc5
- Merge trift2.:/MySQL/M50/extract1-5.0 · 3acb6778
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  3acb6778
- Merge chilla.local:/home/mydev/mysql-5.0--main · f083782c
  istruewing@chilla.local authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  f083782c
19 Sep, 2006 4 commits
- After merge fix. · 7419f502
  istruewing@chilla.local authored Sep 19, 2006
  
  7419f502
- Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty · 5d509b32
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
```
  5d509b32
- Merge bk-internal:/home/bk/mysql-4.0 · 47dc3fbe
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
```
  47dc3fbe
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 3307d448
  istruewing@chilla.local authored Sep 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0--team
```
  3307d448
18 Sep, 2006 8 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 418c1f30
  istruewing@chilla.local authored Sep 18, 2006
```
into  chilla.local:/home/mydev/mysql-5.0--team
```
  418c1f30
- Merge bk-internal:/home/bk/mysql-5.0 · cf9d1c91
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  cf9d1c91
- Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines · f53f015b
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  f53f015b
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · f21eadfc
  svoj@april.(none) authored Sep 18, 2006
```
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  f21eadfc
- Merge bk-internal:/home/bk/mysql-5.0-opt · 2ec485f0
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  2ec485f0
- merge fixes · fae596aa
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
  
  fae596aa
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · 522823b5
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  522823b5
- Merge bk-internal:/home/bk/mysql-4.1-opt · fcf99e85
  gkodinov@dl145s.mysql.com authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
  fcf99e85
16 Sep, 2006 1 commit

Fixed bug #21493: crash for the second execution of a function · d3d3cef8

igor@rurik.mysql.com authored Sep 16, 2006

containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with
the statement mem_root, but rather with the execution mem_root.)

d3d3cef8

15 Sep, 2006 22 commits
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · d8e27606
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d8e27606
- Merge bk-internal:/home/bk/mysql-4.1-opt · c73d2318
  gkodinov/kgeorge@macbook.gmz authored Sep 15, 2006
```
into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
```
  c73d2318
- Add definition of SHUT_RDWR for compiling on windows · 6a0841a1
  msvensson@shellback.(none) authored Sep 15, 2006
  
  6a0841a1
- Merge bk-internal:/home/bk/mysql-5.0-maint · b0fc6840
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  b0fc6840
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 27d85458
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  27d85458
- Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 · b178e40c
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  b178e40c
- Merge msvensson.mysql.internal:mysql/my50-m-bug16574 · bfc3cfd4
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  bfc3cfd4
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 557a8f50
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  557a8f50
- Merge msvensson.mysql.internal:mysql/my50-m-bug16576 · fb89352b
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  fb89352b
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 223c82fd
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  223c82fd
- Merge msvensson.mysql.internal:mysql/my50-m-bug21222 · a297c292
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  a297c292
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 · 2c301549
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  2c301549
- Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4e65deb2
  hartmut@mysql.com/linux.site authored Sep 15, 2006
```
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
```
  4e65deb2
- Add SSL specific linker flags to --libmysqld-libs (Bug #21239) · 871eeadc
  hartmut@mysql.com/linux.site authored Sep 15, 2006
  
  871eeadc
- Merge bk-internal:/home/bk/mysql-5.0-maint · 2ce0da62
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  2ce0da62
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · faeb59cb
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  faeb59cb
- Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t · c3e2d543
  msvensson@shellback.(none) authored Sep 15, 2006
  
  c3e2d543
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 47483245
  cmiller@zippy.cornsilk.net authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  47483245
- Merge msvensson.mysql.internal:mysql/mysql-5.0-maint · bdc78373
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  bdc78373
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · cebd7d9d
  msvensson@shellback.(none) authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  cebd7d9d
- Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown · c4177ec4
  msvensson@shellback.(none) authored Sep 15, 2006
  
  c4177ec4
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · a9b3bd0e
  gkodinov@dl145s.mysql.com authored Sep 15, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  a9b3bd0e