mysql-test/r/func_math.result:
  test result ixed
mysql-test/t/func_math.test:
  test case added
sql/item_strfunc.cc:
  Item_func_format::val_str now handles 'decimal' and 'double' values in
  different way

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

into mysql.com:/usr/home/ram/work/mysql-5.0

  As the bug was already fixed, just testcase added here


mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added

IPCConfig wasn't constructing the connect string properly.


ndb/src/common/mgmcommon/IPCConfig.cpp:
  fix construction of connect string from configuration.
  
  the port number was not being added correctly. This would cause the handle to default
  to localhost:1186

mysql-test/r/type_decimal.result:
  test result fixed
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/field.cc:
  We need to refuse negative integers when 'unsigned'

into mysql.com:/usr/home/ram/work/mysql-5.0

The changes are similar to those pushed with a fix for Bug#9899,
so my guess is that ps_6dbd and ps_7ndb tests were simply not run then.


mysql-test/r/ps_6bdb.result:
  Fix failing test.
mysql-test/r/ps_7ndb.result:
  Fix failing test.

missed ityesterday :()


mysql-test/r/ps_7ndb.result:
  Fix ps_7ndb.result wrt working LIMIT clause.

don't evaluate subqueries during statement prepare, even if they
are not correlated.
With post-review fixes.


sql/mysql_priv.h:
  Add UNCACHEABLE_PREPARE to mark subqueries as non-constant in 
  mysql_stmt_prepare
sql/sql_lex.cc:
  Add a missing assert: noone can call unit::set_limit from 
  mysql_stmt_prepare.
sql/sql_lex.h:
  Comment fixed.
sql/sql_parse.cc:
  Mark new SELECT_LEXes as uncacheable if they created during 
  statement prepare.
sql/sql_prepare.cc:
  Switch off the uncacheable flag when prepare is done.

(Bug which caused its failure before was fixed in the beginning of March
 by the ChangeSet that introduced improved SP-locking).

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

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


myisam/mi_key.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged

into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged

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

  Added missing ';'.


sql/sql_yacc.yy:
  Added missing ';'.

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/instance_options.cc:
  fix order of if branches
server-tools/instance-manager/instance_options.h:
  portability fix
server-tools/instance-manager/parse_output.cc:
  remove stupid comment
server-tools/instance-manager/parse_output.h:
  portability fix

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

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_key.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
sql/item_buff.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.


sql/sql_class.cc:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_1general.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_2myisam.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_3innodb.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_4heap.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_5merge.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.

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

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


sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mysql.com:/home/cps/mysql/trees/mysql-5.0

into mysql.com:/space/my/mysql-5.0

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

support-files/mysql.spec.sh:
  - added the libndbclient static and shared libraries (BUG 10676)

into mysql.com:/opt/local/work/mysql-5.0-7306-final


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/home/cps/mysql/trees/mysql-5.0

Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server


myisam/mi_key.c:
  Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
myisam/mi_rnext_same.c:
  Fixed wrong arguments to ha_key_cmp()
  This caused a compare to fail if we first found a key with end space and then same key without end space
mysql-test/r/ctype_utf8.result:
  Additional test
mysql-test/t/ctype_utf8.test:
  Additional test

server-tools/instance-manager/commands.cc:
  remove commented out code
server-tools/instance-manager/instance.cc:
  use flag instead of int variable
server-tools/instance-manager/instance.h:
  no more default values
server-tools/instance-manager/instance_map.cc:
  use flag to be more verbose
server-tools/instance-manager/instance_options.cc:
  don't read options when looking for an option, use strmake instead of strchr
server-tools/instance-manager/instance_options.h:
  fix comment, use flag instead of int value
server-tools/instance-manager/listener.cc:
  don't like c++ comments
server-tools/instance-manager/log.cc:
  safety: strmake adds trailing zero to the string
server-tools/instance-manager/parse_output.cc:
  use strmake instead of strncpy, renamed varianles to make code more readable
server-tools/instance-manager/parse_output.h:
  get rid of default value

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

  Removed an extra space char.


sql/item_buff.cc:
  Removed an extra space char.

into mysql.com:/opt/local/work/mysql-5.0-7306-final

into mysql.com:/home/dlenev/src/mysql-5.0-bg10015


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

We should not allow explicit or implicit transaction commits inside
of stored functions or triggers (so in autocommit mode we should not
do commits after execution of sub-statement).
Also since we don't support nested statement transactions in 5.0,
we shouldn't commit or rollback stmt transactions while we are inside
stored functions or triggers. This should be fixed in later (>=5.1)
releases.


mysql-test/r/sp_trans.result:
  Added test for bug #10015 "Crash in InnoDB if stored routines are used"
  and for general transaction handling inside of functions.
mysql-test/t/sp_trans.test:
  Added test for bug #10015 "Crash in InnoDB if stored routines are used"
  and for general transaction handling inside of functions.
sql/handler.cc:
  ha_trans_commit()/ha_trans_rollback():
    Since we don't support nested statement transactions in 5.0,
    we can't commit or rollback stmt transactions while we are inside
    stored functions or triggers. So we simply do nothing now.
    This should be fixed in later ( >= 5.1) releases.
sql/item_func.cc:
  Item_func_sp::execute():
    Set THD::transaction.in_sub_stmt flag to TRUE during stored function
    execution to prevent commits and rollbacks for statement level
    transactions, since doing them will ruin such transaction for
    stateemtn which calls this function.
sql/share/errmsg.txt:
  Added error message which says that statements doing explicit or implicit
  commits are disallowed in triggers and stored functions.
sql/sql_base.cc:
  close_thread_tables():
    Clarified comment about committing of statement transactions in
    prelocked mode.
sql/sql_class.h:
  THD::transaction:
    Added in_sub_stmt method which indicates that we are executing
    statements from trigger or stored function now, and thus
    statement transaction belongs to statement which invoked this
    routine and we should not commit or rollback it while executing
    these sub-statements.
sql/sql_parse.cc:
  end_active_trans()/begin_trans()/end_trans():
    We should not commit or rollback global (non-stmt) transaction
    if we are executing stored function or trigger. These checks will
    catch situation when we are trying to do commit or rollback in stored
    procedure which is called from function or trigger.
sql/sql_trigger.h:
  Table_triggers_list::process_triggers():
    Set THD::transaction.in_sub_stmt flag to TRUE during trigger
    execution to prevent commits and rollbacks for statement level
    transactions, since doing them will ruin such transaction for
    stateemtn which invokes this trigger.
sql/sql_yacc.yy:
  Prohibited usage of statements which do explicit or implicit commit or
  rollback inside of stored functions and triggers.