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

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  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.

into  mysql.com:/home/timka/mysql/src/5.0-2486

  fixed compile error


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

into  mysql.com:/home/timka/mysql/src/5.0-2486

into mysql.com:/usersnfs/pchardin/mysql-5.0


sql/sp_head.cc:
  Auto merged

(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

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

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

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

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

so that _only_ backup master replies to API
 

into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717

into deer.(none):/home/hf/work/mysql-5.0.12938

into mysql.com:/M41/mysql-4.1

into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717

into mysql.com:/M50/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987

configure.in:
  Auto merged
include/my_global.h:
  Auto merged

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

into deer.(none):/home/hf/work/mysql-5.0.12938

configure.in:
  Auto merged
include/my_global.h:
  Auto merged

into  mysql.com:/home/timka/mysql/src/5.0-2486

mysql-test/r/select.result:
  Test for BUG#12977.
mysql-test/t/select.test:
  Test for BUG#12977.
sql/sql_base.cc:
  - Compare table qualifier of qualified fields only with tables that
    are not natural joins or their operands.
  - For qualified fields perform recursive search in all operands of
    natural joins that are nested joins.
  - Symmetrically detect ambiguous columns for both operands of
    NATURAL/USING joins.

into  127.(none):/home/osku/mysql/5.0/clean

into  127.(none):/home/osku/mysql/5.0/12084

into  selena.:H:/MYSQL/src/#12517-mysql-4.1

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug11607


ndb/src/ndbapi/NdbTransaction.cpp:
  SCCS merged

into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607

  Post-merge fix.


sql/item_sum.h:
  Post-merge fix.
sql/item_sum.cc:
  Post-merge fix.

mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

into  mysql.com:/home/hartmut/projects/mysql/dev/5.0


client/mysqlimport.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into  mysql.com:/home/hartmut/projects/mysql/dev/4.1


client/mysqlimport.c:
  Auto merged