into  chilla.local:/home/mydev/mysql-5.1-wl2936

Fixed a compiler dependent expression to be more portable.
Initialized 'dummy' in construct_help_options() so that loaded
plugin show themselves as TRUE in the help output.


mysys/hash.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Fixed a compiler dependent expression to be more portable.
sql/handler.cc:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added a DBUG_PRINT.
sql/sql_plugin.cc:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Initialized 'dummy' in construct_help_options() so that loaded
  plugin show themselves as TRUE in the help output.
  Fixed a DBUG_ENTER, added a DBUG_PRINT.
  Added comments.

    set --language correctly even for --help (to have full plugin help)
mysql-test/lib/mtr_cases.pl
    more robust check for innodb


mysql-test/lib/mtr_cases.pl:
  more robust check for innodb
mysql-test/mysql-test-run.pl:
  set --language correctly even for --help (to have full plugin help)

client/mysqltest.c:
  warnings
extra/comp_err.c:
  warnings
sql/event_queue.cc:
  warnings
sql/handler.h:
  warnings
sql/opt_range.cc:
  warnings
sql/opt_range.h:
  warnings
sql/rpl_mi.cc:
  warnings
sql/sql_class.cc:
  wl#2936 post-merge fixes, warnings

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ndb_dd_basic.test:
  Auto merged
mysql-test/t/partition_innodb.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/typelib.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  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_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
include/typelib.h:
  merged
mysql-test/mysql-test-run.pl:
  merged
mysql-test/r/flush2.result:
  merged
mysql-test/r/ndb_dd_basic.result:
  merged
mysql-test/r/partition_innodb.result:
  merged
mysql-test/r/ps_1general.result:
  merged
mysql-test/t/ps_1general.test:
  merged
sql/ha_ndbcluster.cc:
  merged
sql/item_create.cc:
  merged
sql/mysqld.cc:
  merged
sql/rpl_utility.h:
  merged
sql/set_var.cc:
  merged
sql/sql_class.cc:
  merged
sql/sql_yacc.yy:
  merged
storage/innobase/handler/ha_innodb.cc:
  merged
storage/innobase/handler/ha_innodb.h:
  merged

fixed an assert crash


include/mysql/plugin.h:
  more wl#2936 fixes: no implicit ha_thd() calls
mysql-test/mysql-test-run.pl:
  don't load system-wide plugins
mysql-test/r/partition_innodb.result:
  fix the test
mysql-test/t/partition_innodb.test:
  fix the test
sql/handler.cc:
  more wl#2936 fixes: no implicit ha_thd() calls
sql/handler.h:
  more wl#2936 fixes: no implicit ha_thd() calls
sql/sql_class.cc:
  more wl#2936 fixes: no implicit ha_thd() calls
sql/sql_plugin.cc:
  more wl#2936 fixes: assert crash
storage/innobase/handler/ha_innodb.cc:
  more wl#2936 fixes: no implicit ha_thd() calls

    remove endspaces and tabs


sql/sql_plugin.cc:
  remove endspaces and tabs

include/mysql/plugin.h:
  warning. no int/realsize
mysys/my_getopt.c:
  combination of prefixes (e.g. --loose-skip-) didn't work
sql/event_queue.cc:
  warning
sql/handler.cc:
  assert
sql/handler.h:
  comment
sql/item_create.cc:
  warnings
sql/log.cc:
  warnings
sql/mysqld.cc:
  wl#2936 - fixing problems (memory leak in load_defaults,
  garbage in opt_[slow_]logname
sql/partition_element.h:
  warnings
sql/rpl_utility.h:
  warnings
sql/set_var.cc:
  comment
sql/set_var.h:
  warnings
sql/sql_class.cc:
  warnings
sql/sql_parse.cc:
  warnings
sql/sql_plugin.cc:
  wl#2936 - fixing problems: portability, coding style,
  reporting of spurious errors, crashes, incorrect help output
storage/example/ha_example.cc:
  comment
storage/innobase/handler/ha_innodb.cc:
  wl#2936 - fixing problems (crash)

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0

scripts/make_win_bin_dist:
  don't try to copy the pdb files from the release output folder

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


configure.in:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


configure.in:
  Auto merged

configure.in:
  recognize service pack version strings

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  mysql.com:/home/kent/bk/tmp3/mysql-4.1-build

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build


config/ac-macros/zlib.m4:
  Auto merged
mysys/my_memmem.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

  Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory


zlib/Makefile.am:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
config/ac-macros/zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
mysys/my_memmem.c:
  Back port of include change and copyright from 5.1

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


CMakeLists.txt:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
sql/set_var.cc:
  Auto merged
support-files/mysql.spec.sh:
  merge fix

support-files/mysql.spec.sh:
  add mysql_install_db.1 back

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged

mysql-test/r/windows.result:
  result fixed

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union

mysql-test/r/events_trans.result:
  result fixed
mysql-test/r/windows.result:
  merging fix
mysql-test/t/events_trans.test:
  moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
  New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
  New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt