into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-new

 to 5.1. Undoing the merge.


mysql-test/r/innodb.result:
  Undoing erroneous auto-merge 5.0 -> 5.1
mysql-test/t/innodb.test:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.cc:
  Undoing erroneous auto-merge 5.0 -> 5.1
sql/ha_innodb.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/btr/btr0sea.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0dict.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/dict/dict0load.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/buf0buf.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0dict.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/dict0load.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/include/rem0cmp.h:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/rem/rem0cmp.c:
  Undoing erroneous auto-merge 5.0 -> 5.1
storage/innobase/row/row0mysql.c:
  Undoing erroneous auto-merge 5.0 -> 5.1

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2

Fixed logic in handler to make handler now show up as enabled.


sql/ha_federated.cc:
  BUG# 15559
  
  Fixed logic in federated_db_init. Also, the query length was being chopped 
  too much breaking the initial select query.

mysql-test/r/sp.result:
  Updated result.

sql/share/errmsg.txt:
  Post-merge fix.

into  mysql.com:/usr/home/pem/mysql-5.1-new


BitKeeper/triggers/post-commit:
  Merge.
configure.in:
  Manual merge.
mysql-test/r/sp.result:
  Merge.
mysql-test/r/view.result:
  Merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp_head.cc:
  Merge.
sql/sql_parse.cc:
  Merge.
sql/sql_table.cc:
  Merge.
sql/sql_yacc.yy:
  Merge.

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

sql/sql_acl.cc:
  Fixed compile error.

into  mysql.com:/data0/mysqldev/my/mysql-5.0

configure.in:
  Bump version number following release clone-off

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

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


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

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

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


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

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


BitKeeper/triggers/post-commit:
  Auto merged

into  mysql.com:/home/timka/mysql/src/5.1-dbg


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_base.cc:
  SCCS merged
sql/table.cc:
  SCCS merged

mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

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


BitKeeper/triggers/post-commit:
  Auto merged

BitKeeper/etc/ignore:
  added client/mysqlslap
mysql-test/r/innodb.result:
  Update results

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/rem0cmp.h:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
mysql-test/r/innodb.result:
  Resolve conflicts
sql/share/errmsg.txt:
  Resolve conflict

mysql-test/r/innodb.result:
  Update result file

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/field.cc:
  Auto merged
mysql-test/r/type_binary.result:
  Resolve conflicts
mysql-test/t/type_binary.test:
  Resolve conflicts

 prepared statement execute


mysql-test/r/sp.result:
  Test results fixed: a fix for Bug#15392
mysql-test/t/sp.test:
  A test case for Bug#15392 "Server crashes during prepared
  statement execute". No test case for error in
  Item_func_set_user_var::update as the only possible one is OOM.
sql/sp_head.cc:
  A fix for Bug#15392 "Server crashes during prepared statement
  execute": the bug was caused by mysql_change_db() call
  which was overwriting the error state of 'ret'.
  Later in the code, suv->fix_fields() would discover
  thd->net.report_error and return it without completing
  its work. As the return value of fix_fields() was ignored,
  the server would afterwards crash in suv->update().
  The fix makes sure that a possible internal error
  is raised in reset_lex_and_exec_core and then is
  handled in sp_head::execute_procedure.

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

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss52

  Put options in order.
set_var.cc:
  Put system variables back in order.


sql/set_var.cc:
  Put system variables back in order.
sql/mysqld.cc:
  Put options in order.

 to crash".
 Changes from snapshot innodb-5.0-ss52.
 Note that buf_block_t::index should be protected by btr_search_latch
 or an s-latch or x-latch on the index page.
 btr_search_drop_page_hash_index(): Read block->index while holding
 btr_search_latch and use the cached value in the loop. Remove some
 redundant assertions.
 Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also added test cases to 9802.


innobase/btr/btr0sea.c:
  Changes from innodb-5.0-ss52
innobase/dict/dict0dict.c:
  Changes from innodb-5.0-ss52
innobase/dict/dict0load.c:
  Changes from innodb-5.0-ss52
innobase/include/buf0buf.h:
  Changes from innodb-5.0-ss52
innobase/include/dict0dict.h:
  Changes from innodb-5.0-ss52
innobase/include/dict0load.h:
  Changes from innodb-5.0-ss52
innobase/include/rem0cmp.h:
  Changes from innodb-5.0-ss52
innobase/rem/rem0cmp.c:
  Changes from innodb-5.0-ss52
innobase/row/row0mysql.c:
  Changes from innodb-5.0-ss52
mysql-test/r/innodb.result:
  Changes from innodb-5.0-ss52
mysql-test/t/innodb.test:
  Changes from innodb-5.0-ss52
sql/ha_innodb.cc:
  Changes from innodb-5.0-ss52
sql/ha_innodb.h:
  Changes from innodb-5.0-ss52

into  mysql.com:/home/jimw/my/mysql-5.1-clean

VC++Files/storage/bdb/bdb.vcproj:
  Update BDB project file

mysql-test/r/sp-error.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

storage/bdb/Makefile.in:
  Trim list of BDB directories

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
sql/share/errmsg.txt:
  Manual merge.

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

into  production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.1-new

Changed variable type and added comment in sp.c.


sql/sp.cc:
  Changed variable type and added comment. (Review fix)