Commits · 78590ad53bae1e000e9b4c27f80d808f3a4a76d1 · Kirill Smelkov / mariadb

09 Sep, 2005 19 commits
- aftermerge · 78590ad5
  serg@serg.mylan authored Sep 09, 2005
  
  78590ad5
- merged · 3d7844ca
  serg@serg.mylan authored Sep 09, 2005
  
  3d7844ca
- aftermerge · f16bb5da
  serg@serg.mylan authored Sep 09, 2005
  
  f16bb5da
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 06fe0537
  andrey@lmy004. authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
  06fe0537
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 98fee7f2
  sergefp@mysql.com authored Sep 09, 2005
```
into mysql.com:/home/psergey/mysql-5.0-merge
```
  98fee7f2
- Post-merge fixes · cd813a09
  sergefp@mysql.com authored Sep 09, 2005
  
  cd813a09
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b69f49c0
  serg@serg.mylan authored Sep 09, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
  b69f49c0
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 13d3cf8f
  andrey@lmy004. authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
  13d3cf8f
- Post-merge fixes · 57c3ed9e
  sergefp@mysql.com authored Sep 09, 2005
  
  57c3ed9e
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b7440b7a
  andrey@lmy004. authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
  b7440b7a
- merged · c7eaac52
  serg@serg.mylan authored Sep 09, 2005
  
  c7eaac52
- Post-merge fixes. Call sp_cache_clear in THD::cleanup. · 45d46a47
  sergefp@mysql.com authored Sep 09, 2005
  
  45d46a47
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f93c5420
  andrey@lmy004. authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
  f93c5420
- Merge 4.1->5.0 · 3d6759d1
  sergefp@mysql.com authored Sep 09, 2005
  
  3d6759d1
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 916359b5
  serg@serg.mylan authored Sep 09, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
  916359b5
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · eac4388c
  sergefp@mysql.com authored Sep 09, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug12943
```
  eac4388c
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 871ac087
  igor@rurik.mysql.com authored Sep 08, 2005
```
into rurik.mysql.com:/home/igor/mysql-5.0
```
  871ac087
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · f7957c98
  pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Sep 09, 2005
```
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
```
  f7957c98
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2fdea2c2
  pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Sep 08, 2005
```
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
```
  2fdea2c2
08 Sep, 2005 21 commits
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 819db247
  serg@serg.mylan authored Sep 09, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  819db247
- olap.result, olap.test: · 6bbdd66e
  igor@rurik.mysql.com authored Sep 08, 2005
```
  Added a test case with VIEW for bug #12885.
```
  6bbdd66e
- Merge bk-internal:/home/bk/mysql-5.0 · 3c472356
  jimw@mysql.com authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  3c472356
- Fix -ansi -pedantic compilation failure. · 28d61a05
  konstantin@mysql.com authored Sep 09, 2005
  
  28d61a05
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 7e9646f0
  serg@serg.mylan authored Sep 08, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  7e9646f0
- BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache · a7f2179c
  serg@serg.mylan authored Sep 08, 2005
  
  a7f2179c
- Manual merge · b2f0f908
  igor@rurik.mysql.com authored Sep 08, 2005
  
  b2f0f908
- Manual merge · bcae5256
  igor@rurik.mysql.com authored Sep 08, 2005
  
  bcae5256
- Merge rurik.mysql.com:/home/igor/mysql-4.1 · 3b76329f
  igor@rurik.mysql.com authored Sep 08, 2005
```
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
```
  3b76329f
- sql_select.cc: · 19192328
  igor@rurik.mysql.com authored Sep 08, 2005
```
  Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
  Added test case for bug #12885.
```
  19192328
- Merge mysql.com:/home/jimw/my/mysql-5.0-12550 · 06e44486
  jimw@mysql.com authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
  06e44486
- fix for bug #12651 (item of a prepared query allocated on non-permanent · 1a46ea10
  andrey@lmy004. authored Sep 08, 2005
```
are thus dangling later)
```
  1a46ea10
- Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 13d81791
  timour@mysql.com authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
  13d81791
- SignalSender.cpp: · 0f4bb8e6
  tulin@dl145c.mysql.com authored Sep 08, 2005
```
  fixed compile error
```
  0f4bb8e6
- Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 818e2a3e
  timour@mysql.com authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
  818e2a3e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b5583947
  petr@mysql.com authored Sep 08, 2005
```
into mysql.com:/usersnfs/pchardin/mysql-5.0
```
  b5583947
- fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter · 4a28ddac
  petr@mysql.com authored Sep 08, 2005
```
(recommit with the right Bug#)
```
  4a28ddac
- Remove an obsolete comment and an unused variable. · 8d0dd7a4
  konstantin@mysql.com authored Sep 08, 2005
  
  8d0dd7a4
- corrected type · ffea32c6
  tomas@poseidon.ndb.mysql.com authored Sep 08, 2005
  
  ffea32c6
- corrected typo · 98a52fa9
  tomas@poseidon.ndb.mysql.com authored Sep 08, 2005
  
  98a52fa9
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b75340e7
  tomas@poseidon.ndb.mysql.com authored Sep 08, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  b75340e7