into  polly.local:/tmp/maint/bug22728/my51-bug22728


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/handler.cc:
  Auto merged

into  polly.local:/tmp/maint/bug22728/my50-bug22728


mysql-test/r/innodb_mysql.result:
  Null merge from 4.1
mysql-test/t/innodb_mysql.test:
  Null merge from 4.1
sql/handler.cc:
  Null merge from 4.1

The bug is present only in 4.1, will be null-merged to 5.0

For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.


mysql-test/r/innodb_mysql.result:
  Added testcase for bug #22728 "Handler_rollback value is growing"
mysql-test/t/innodb_mysql.test:
  Added testcase for bug #22728 "Handler_rollback value is growing"
sql/handler.cc:
  For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.

into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my51-bug21139

into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139

- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test


mysql-test/t/lowercase_fs_off.test:
  Added test to check if this embedded built in which case we just skip this test.

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


extra/Makefile.am:
  Auto merged

 - Remove the wildcard dependcy on the charset xml files


extra/Makefile.am:
  Remove the "wildcard" dependency

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged

 - Make built sources only depend on it's sources not the built tool


extra/Makefile.am:
  The files built by "comp_err" should only depend on their sources not the tool comp_err
  The built sources should only be cleaned by "make distclean"
sql/Makefile.am:
  The built file "lex_hash.h" should depend on it's sources

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/work/my51-work


extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1

installed charset dir being used.


mysql-test/mysql-test-run.pl:
  Add character-sets-dir argument to "mysql". That avoids a local
  installed charset dir being used.

when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.


BitKeeper/deleted/.del-have_ndb_status_ok.require:
  Delete: mysql-test/r/have_ndb_status_ok.require
mysql-test/include/have_ndb.inc:
  Remove the test to check if environment variable NDB_STATUS_OK is set
mysql-test/mysql-test-run.pl:
  Don't set env variable NDB_STATUS_OK or NDB_SLAVE_STATUS_OK
  Use 1 and 0 to indicate if cluster has been installed ok.

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
include/my_net.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

Add linebreak


BitKeeper/etc/ignore:
  Added mysql-test/mysql-test-run-shell to the ignore list

Symlink mysql-test-run to mysql-test-run.pl


mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Build a link to mysql-test-run.pl called mysql-test-run

into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


zlib/Makefile.am:
  Auto merged

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


zlib/Makefile.am:
  Auto merged

 - Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.


mysql-test/mysql-test-run.pl:
  Allow --skip-core-file to be specified in master.opt file, which will turn
  off the default behaviour to generate core file.
  Remove the option --exit-info from being passed to myslqd when it's started. If used 
  it will just overwrite all the options for skip-stack-trace etc.
mysql-test/t/disabled.def:
  Enable crash_commit_before
mysql-test/t/crash_commit_before-master.opt:
  Run crash_commit_before test case without core file and stack trace.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/my_net.h:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged

In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. 


include/mysql/plugin.h:
  Optional to pass parameter now to init and deinit functions
sql/ha_ndbcluster.cc:
  Cleanup, handlerton is now a pointer.
sql/ha_ndbcluster_binlog.cc:
  Cleanup (handlerton is now a pointer)
sql/ha_ndbcluster_binlog.h:
  Cleanup (handlerton is now a pointer)
sql/ha_partition.cc:
  Cleaned up handlerton change
sql/handler.cc:
  Cheanup of handlerton change
sql/item_sum.cc:
  Cleanedup of handlerton change
sql/log.cc:
  Cleanup of handlerton change
sql/mysql_priv.h:
  Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!)
sql/mysqld.cc:
  Cleanup of handlerton changes and reverted have variable patch
sql/partition_info.cc:
  Cleanup of handlerton (we need to clean this up a bit more).
sql/set_var.cc:
  Cleanup related to handlerton changes
sql/sql_cache.cc:
  Handlerton changes cleanup
sql/sql_insert.cc:
  Handlerton changes cleanup.
sql/sql_partition.cc:
  Handlerton cleanup changes
sql/sql_plugin.cc:
  Handlerton changes.
  
  init() can now be controlled by a plugin specific startup. 
  
  There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines.
sql/sql_select.cc:
  Handlerton cleanup changes
sql/sql_show.cc:
  Handlerton cleanup changes
sql/sql_table.cc:
  Handlerton cleanup changes
sql/table.cc:
  Cleanup
storage/archive/ha_archive.cc:
  Cleanup
storage/archive/ha_archive.h:
  Cleanup
storage/blackhole/ha_blackhole.cc:
  Cleanup
storage/csv/ha_tina.cc:
  Cleanup
storage/example/ha_example.cc:
  Cleanup
storage/federated/ha_federated.cc:
  Cleanup
storage/heap/ha_heap.cc:
  Cleanup
storage/innobase/handler/ha_innodb.cc:
  Cleanup
storage/myisam/ha_myisam.cc:
  Cleanup
storage/myisammrg/ha_myisammrg.cc:
  Cleanup

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_net.h:
  Auto merged

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