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

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

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

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

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.

extra/yassl/taocrypt/include/misc.hpp:
  Disable X86ASM on OsX

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

  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

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


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

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

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

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


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

created item into item->result_field, not *(item->ref)->result_field.


mysql-test/r/view.result:
  Tescase for BUG#12941
mysql-test/t/view.test:
  Tescase for BUG#12941

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


mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
sql/hostname.cc:
  Manual merge

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

config/ac-macros/ha_federated.m4:
   Fixed typo

  Added test cases for bug #12863.
item_sum.cc, item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.


sql/item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
sql/item_sum.cc:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
mysql-test/t/func_gconcat.test:
  Added test cases for bug #12863.
mysql-test/r/func_gconcat.result:
  Added test cases for bug #12863.

into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0

into mysql.com:/Users/eric/bktmp/mysql-5.0