Commits · d06745a80541322a1dabfef458726838c91bfa62 · Kirill Smelkov / mariadb

21 Sep, 2006 4 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d06745a8
unknown authored Sep 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
d06745a8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dab27eaa
unknown authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
dab27eaa

Merge trift2.:/MySQL/M50/extract1-5.0 · 113f983e

unknown authored Sep 21, 2006

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

113f983e

Merge chilla.local:/home/mydev/mysql-5.0--main · 5a7c671c

unknown authored Sep 21, 2006

into  chilla.local:/home/mydev/mysql-5.0-toteam


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

5a7c671c

20 Sep, 2006 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cda50afc
  unknown authored Sep 20, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
  cda50afc
19 Sep, 2006 4 commits

After merge fix. · 11ba3204
unknown authored Sep 19, 2006

11ba3204

Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty · 08f4565e

unknown authored Sep 19, 2006

into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
myisam/mi_test_all.res:
  Manual merge from 4.1.
sql/sql_select.cc:
  Manual merge from 4.1.

08f4565e

Merge bk-internal:/home/bk/mysql-4.0 · 82a72ee1

unknown authored Sep 19, 2006

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
myisam/mi_rkey.c:
  Manual null merge as a better fix is already present.
mysql-test/r/myisam.result:
  Manual null merge as a better fix is already present.
mysql-test/t/myisam.test:
  Manual null merge as a better fix is already present.
sql/sql_select.cc:
  Manual merge of purify improvements.

82a72ee1

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 06ced7c1

unknown authored Sep 19, 2006

into  chilla.local:/home/mydev/mysql-5.0--team


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

06ced7c1

18 Sep, 2006 9 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 8fbadf05

unknown authored Sep 18, 2006

into  chilla.local:/home/mydev/mysql-5.0--team


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

8fbadf05

Merge bk-internal:/home/bk/mysql-5.0 · 665ebc05

unknown authored Sep 18, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged

665ebc05

Merge april.(none):/home/svoj/devel/bk/mysql-4.1-engines · 74c82824

unknown authored Sep 18, 2006

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines


myisam/mi_rkey.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

74c82824

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · dfb219f6

unknown authored Sep 18, 2006

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

dfb219f6

Merge bk-internal:/home/bk/mysql-5.0-opt · db1a94a7

unknown authored Sep 18, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

db1a94a7

merge fixes · 4c8e0e19
unknown authored Sep 18, 2006

4c8e0e19
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 86e716e1
unknown authored Sep 18, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
86e716e1

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · 7a0f9c8d

unknown authored Sep 18, 2006

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

7a0f9c8d

Merge bk-internal:/home/bk/mysql-4.1-opt · 96dbaffd
unknown authored Sep 18, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
96dbaffd

16 Sep, 2006 1 commit

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

unknown 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.)


mysql-test/r/sp.result:
  Added a test case for bug #21493.
mysql-test/t/sp.test:
  Added a test case for bug #21493.
sql/sql_delete.cc:
  Fixed bug #21493: crash for the second execution of a function
  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.
sql/sql_insert.cc:
  Fixed bug #21493: crash for the second execution of a function
  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.
sql/sql_lex.cc:
  Fixed bug #21493: crash for the second execution of a function
  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.
sql/sql_lex.h:
  Fixed bug #21493: crash for the second execution of a function
  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.
sql/sql_update.cc:
  Fixed bug #21493: crash for the second execution of a function
  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.

58e178c5

15 Sep, 2006 21 commits
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 24cdd480
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  24cdd480
- Merge bk-internal:/home/bk/mysql-4.1-opt · e5345197
  unknown authored Sep 15, 2006
```
into  macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt


mysql-test/r/subselect.result:
  merge of 4.1-opt
mysql-test/t/subselect.test:
  merge of 4.1-opt
sql/opt_range.h:
  merge of 4.1-opt
```
  e5345197
- Add definition of SHUT_RDWR for compiling on windows · 1e5685bd
  unknown authored Sep 15, 2006
  
  1e5685bd
- Merge bk-internal:/home/bk/mysql-5.0-maint · 9e1a6b0e
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  9e1a6b0e
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 66b6357e
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  66b6357e
- Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 · 6373941a
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
```
  6373941a
- Merge msvensson.mysql.internal:mysql/my50-m-bug16574 · 05b14821
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  05b14821
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 0fa2995d
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0fa2995d
- Merge msvensson.mysql.internal:mysql/my50-m-bug16576 · e15148ad
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
```
  e15148ad
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 860ae722
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  860ae722
- Merge msvensson.mysql.internal:mysql/my50-m-bug21222 · 040c9378
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
  040c9378
- Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 · cb92ed64
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/Makefile.am:
  Auto merged
```
  cb92ed64
- Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1878b9f6
  unknown authored Sep 15, 2006
```
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
```
  1878b9f6
- Add SSL specific linker flags to --libmysqld-libs (Bug #21239) · 7974ef2c
  unknown authored Sep 15, 2006
  
  7974ef2c
- Merge bk-internal:/home/bk/mysql-5.0-maint · 1c0c90bd
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  1c0c90bd
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · a55a105b
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  a55a105b
- Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t · 6653bfb3
  unknown authored Sep 15, 2006
```
extra/yassl/testsuite/test.hpp:
  Remove define for __MACH__
  http://bugs.debian.org/387369
```
  6653bfb3
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3e3d97ea
  unknown authored Sep 15, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  3e3d97ea
- Merge msvensson.mysql.internal:mysql/mysql-5.0-maint · 0dae6897
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0dae6897
- Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 0deefdd3
  unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


vio/viosocket.c:
  Auto merged
```
  0deefdd3
- Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown · 3860571e
  unknown authored Sep 15, 2006
  
  3860571e