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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_cmpfunc.h:
  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.

  fixed compile error


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

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

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 mysql.com:/M41/mysql-4.1

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

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

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

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/4.1


client/mysqlimport.c:
  Auto merged

into  mysql.com:/home/alexi/mysql-5.0


sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/alexi/mysql-4.1

into moonbone.local:/work/12922-bug-5.0-mysql

  Fix for fix bug#12922.


sql/item.cc:
  Fix for fix bug#12922.

Any form of HANDLER statement is forbidden from usage in stored procedures/functions.


mysql-test/r/sp-error.result:
  Results for the test case for Bug#12995 added.
mysql-test/t/sp-error.test:
  Test case for Bug#12995 added.
sql/sql_yacc.yy:
  Forbid any form of "HANDLER" statement from use in stored procedures/functions.

Fields of view represented by Item_direct_view_ref. When complex expression
such as if(sum()>...,...) is splited in simpler parts by refs was ignored.
Beside this direct ref doesn't use it's result_field and thus can't store
it's result in tmp table which is needed for sum() ... group.
All this results in reported bug.

Item::split_sum_func2() now converts Item_direct_view_ref to Item_ref to
make fields from view being storable in tmp table.


sql/item.h:
  Fix bug #12922 if(sum(),...) with group from view returns wrong results
  Added function ref_type() to distinguish Item_ref subclasses
sql/item.cc:
  Fix bug #12922 if(sum(),...) with group from view returns wrong results
   Item::split_sum_func2() now converts Item_direct_view_ref to Item_ref to make fields from view being storable in tmp table.
mysql-test/t/view.test:
  Test case for bug#12922 if(sum(),...) with group from view returns wrong results
mysql-test/r/view.result:
  Test case for bug#12922 if(sum(),...) with group from view returns wrong results

into  zim.(none):/home/brian/mysql/mysql-5.0


sql/examples/ha_tina.cc:
  Auto merged

Small tweak for random read performance (we shouldn't always tell the OS that we will be doing a linear scan). 


sql/examples/ha_tina.cc:
  Small tweak for random read performance.

into  mysql.com:/home/alexi/dev/mysql-5.0-0


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-4.1-0


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

  Post merge changes
sql_yacc.yy:
  Post merge changes
sql_select.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions (post merge changes).
   The function add_key_fields() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.


sql/item_cmpfunc.cc:
  Post merge changes
sql/opt_range.cc:
  Post merge changes
sql/sql_select.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions (post merge changes).
   The function add_key_fields() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.
sql/sql_yacc.yy:
  Post merge changes.
mysql-test/r/join_outer.result:
  Post merge changes

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

into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_like.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1.b12611

into  mysql.com:/usr/home/bar/mysql-5.0

  use saved view db name in case of view

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

  Variable character_set_system is selectable now
  More accurate error message results during 
  update of character_set_system and some other read only variables


mysql-test/r/variables.result:
  Fix for bug#11775 Variable character_set_system does not exist (sometimes).
    test case
mysql-test/t/variables.test:
  Fix for bug#11775 Variable character_set_system does not exist (sometimes).
    test case