Commits · 0ef988ada34636dee1af7c802f96b136eb7cc936 · Kirill Smelkov / mariadb

09 Sep, 2005 7 commits

unknown authored Sep 09, 2005


client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

0ef988ad

Post-merge fixes. Call sp_cache_clear in THD::cleanup. · f32088a9
unknown authored Sep 09, 2005

f32088a9

Merge 4.1->5.0 · 20994fec

unknown authored Sep 09, 2005


client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

20994fec

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ed7e973

unknown authored Sep 09, 2005

into mysql.com:/home/psergey/mysql-5.0-bug12943


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

5ed7e973

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 65ba93fd

unknown authored Sep 08, 2005

into rurik.mysql.com:/home/igor/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  Auto merged

65ba93fd

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1266ccc8

unknown authored Sep 09, 2005

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/ndbapi/SignalSender.cpp:
  Merge

1266ccc8

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · a49e23ad

unknown authored Sep 08, 2005

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  SCCS merged

a49e23ad

08 Sep, 2005 33 commits

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 213fa9cb
unknown authored Sep 09, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
213fa9cb

olap.result, olap.test: · 2eaee052

unknown authored Sep 08, 2005

  Added a test case with VIEW for bug #12885.


mysql-test/t/olap.test:
  Added a test case with VIEW for bug #12885.
mysql-test/r/olap.result:
  Added a test case with VIEW for bug #12885.

2eaee052

Merge bk-internal:/home/bk/mysql-5.0 · 1d003c52
unknown authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
1d003c52
Fix -ansi -pedantic compilation failure. · 2b17f750
unknown authored Sep 09, 2005

2b17f750
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 5a49a632
unknown authored Sep 08, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_cmpfunc.h:
  Auto merged
```
5a49a632
BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache · afbdcd41
unknown authored Sep 08, 2005

afbdcd41
Manual merge · 1e506970
unknown authored Sep 08, 2005

1e506970

Manual merge · 10349b11

unknown authored Sep 08, 2005


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

10349b11

Merge rurik.mysql.com:/home/igor/mysql-4.1 · 17ec83fc
unknown authored Sep 08, 2005
```
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
```
17ec83fc

sql_select.cc: · 91d2150d

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


mysql-test/r/olap.result:
  Added test case for bug #12885.
mysql-test/t/olap.test:
  Added test case for bug #12885.
sql/sql_select.cc:
  Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.

91d2150d

Merge mysql.com:/home/jimw/my/mysql-5.0-12550 · cd4d340b
unknown authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
cd4d340b
Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 5ae2ca21
unknown authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
5ae2ca21

SignalSender.cpp: · 91d05c52

unknown authored Sep 08, 2005

  fixed compile error


ndb/src/ndbapi/SignalSender.cpp:
  fixed compile error

91d05c52

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 1cb41383
unknown authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
1cb41383
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 996d4c45
unknown authored Sep 08, 2005
```
into mysql.com:/usersnfs/pchardin/mysql-5.0


sql/sp_head.cc:
  Auto merged
```
996d4c45

fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter · 1b15f430

unknown authored Sep 08, 2005

(recommit with the right Bug#)


mysql-test/r/sp.result:
  result file modified to reflect new test
mysql-test/t/sp.test:
  added test for the bug
sql/item.cc:
  protect Item_splocal value from modification by CONCAT() et al
sql/item.h:
  added a buffer to save Item_splocal string pointer
sql/sp_head.cc:
  don't employ reuse mechanism to save var into itself

1b15f430

Remove an obsolete comment and an unused variable. · 824750a9

unknown authored Sep 08, 2005


sql/sp_head.cc:
  Remove an obsolete comment (recursion in SP is disabled)
sql/sql_select.h:
  Remove an unused variable.

824750a9

corrected type · e61d56a9
unknown authored Sep 08, 2005

e61d56a9
corrected typo · 110230be
unknown authored Sep 08, 2005

110230be
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 48e97a16
unknown authored Sep 08, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
48e97a16

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 66d6ae2c

unknown authored Sep 08, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged

66d6ae2c

corrected printouts in backup test · 9c5dd6a2

unknown authored Sep 08, 2005


ndb/src/kernel/blocks/backup/Backup.hpp:
  missed this file in prev commit
ndb/test/src/NdbBackup.cpp:
  corrected printouts in backup test

9c5dd6a2

corrected prev fix for bug #13054 · ef0a284a
unknown authored Sep 08, 2005
```
so that _only_ backup master replies to API
 
```
ef0a284a
Merge bk-internal:/home/bk/mysql-5.0 · fc3c0de4
unknown authored Sep 08, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
```
fc3c0de4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · dd1fd086
unknown authored Sep 08, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.12938
```
dd1fd086
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · f7b7ced6
unknown authored Sep 08, 2005
```
into mysql.com:/M41/mysql-4.1
```
f7b7ced6
Merge bk-internal:/home/bk/mysql-5.0 · 0246d3c8
unknown authored Sep 08, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
```
0246d3c8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8e2cc501
unknown authored Sep 08, 2005
```
into mysql.com:/M50/mysql-5.0
```
8e2cc501
Merge bk-internal:/home/bk/mysql-5.0 · 728b9be6
unknown authored Sep 08, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987
```
728b9be6
Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0 · 05e26b12
unknown authored Sep 08, 2005
```
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
```
05e26b12

yassl fix for ia64 + icc · bcd31928

unknown authored Sep 08, 2005


extra/yassl/taocrypt/include/runtime.hpp:
  Check for both __ICC and __INTEL_COMPILER
extra/yassl/taocrypt/include/types.hpp:
  Check for both __ICC and __INTEL_COMPILER

bcd31928

Bug #13054 start backup command return may be interrpted · e53871c3
unknown authored Sep 08, 2005

e53871c3
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · d8eafd95
unknown authored Sep 08, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.12938
```
d8eafd95