Commits · 371ad56d39fc1358da8d556b8c6045ea49d46748 · nexedi / 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

371ad56d

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

a14b8f9e

Merge 4.1->5.0 · ccaf0317

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

ccaf0317

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

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

dd8a7c70

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 92844b08

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

92844b08

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1eea70b8

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

1eea70b8

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

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

b28e6de0

08 Sep, 2005 33 commits

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

olap.result, olap.test: · 3f451df6

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.

3f451df6

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

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


sql/item_cmpfunc.h:
  Auto merged
```
60dd90d1
BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache · 46ea3851
unknown authored Sep 08, 2005

46ea3851
Manual merge · 17415670
unknown authored Sep 08, 2005

17415670

Manual merge · 0f8b2ea0

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

0f8b2ea0

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

sql_select.cc: · f75e98c0

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.

f75e98c0

Merge mysql.com:/home/jimw/my/mysql-5.0-12550 · 6dffd65a
unknown authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
6dffd65a
Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 09aa87af
unknown authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
09aa87af

SignalSender.cpp: · 75f2a27b

unknown authored Sep 08, 2005

  fixed compile error


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

75f2a27b

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 2f7e93c7
unknown authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
2f7e93c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2adf7f95
unknown authored Sep 08, 2005
```
into mysql.com:/usersnfs/pchardin/mysql-5.0


sql/sp_head.cc:
  Auto merged
```
2adf7f95

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

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

19b455e0

Remove an obsolete comment and an unused variable. · db2f3e9d

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.

db2f3e9d

corrected type · 6ece5e8f
unknown authored Sep 08, 2005

6ece5e8f
corrected typo · 10d5f1ff
unknown authored Sep 08, 2005

10d5f1ff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 26bd81f4
unknown authored Sep 08, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
26bd81f4

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

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

a0b0f334

corrected printouts in backup test · 9f1cce62

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

9f1cce62

corrected prev fix for bug #13054 · 08542fe8
unknown authored Sep 08, 2005
```
so that _only_ backup master replies to API
 
```
08542fe8
Merge bk-internal:/home/bk/mysql-5.0 · 83e3280a
unknown authored Sep 08, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
```
83e3280a
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7316ff8a
unknown authored Sep 08, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.12938
```
7316ff8a
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · b9595a0a
unknown authored Sep 08, 2005
```
into mysql.com:/M41/mysql-4.1
```
b9595a0a
Merge bk-internal:/home/bk/mysql-5.0 · 24c28cb7
unknown authored Sep 08, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
```
24c28cb7
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 75350dcf
unknown authored Sep 08, 2005
```
into mysql.com:/M50/mysql-5.0
```
75350dcf
Merge bk-internal:/home/bk/mysql-5.0 · 6b7b4afc
unknown authored Sep 08, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987
```
6b7b4afc
Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0 · a3a58963
unknown authored Sep 08, 2005
```
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
```
a3a58963

yassl fix for ia64 + icc · 9d62e57c

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

9d62e57c

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

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