into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  manual change to new api

  Move copying of global variables into thd.variables into plugin_thdvar_init().
  plugin_thdvar_init() may be called multiple times when THD::change_user() is called.
  This fixes a plugin ref-count leak when running the test mysql_client_test


sql/sql_class.cc:
  wl2936
    Initialize thd.variables to zero in constructor.
    Move copying of global variables into thd.variables into plugin_thdvar_init()
sql/sql_plugin.cc:
  wl2936
    Move copying of global variables into thd.variables into plugin_thdvar_init().
    plugin_thdvar_init() may be called multiple times when THD::change_user() is called.
    This fixes a plugin ref-count leak when running the test mysql_client_test

Fix tests when InnoDB is not built-in. Innodb options would cause
mysqld to abort with an error indicating that the option is unknown.
Fix tests on Windows where mysql-test-run.pl was unable to probe
mysqld for version and variables information, caused by output
being redirected to a log file instead.


mysql-test/mysql-test-run.pl:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is not required here. This test case runs only
  if innodb is available. In this case the option must be present.
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is not required here. This test case runs only
  if innodb is available. In this case the option must be present.
mysql-test/t/federated_transactions-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/myisam-blob-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_auto_increment-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_deadlock_innodb-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_insert_id-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_insert_id_pk-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_insert_ignore-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_multi_engine-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_read_only-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_relayrotate-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_basic_11bugs-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_basic_11bugs-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_create_table-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_func003-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_sp003-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_row_sp003-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/rpl_stm_000001-slave.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
mysql-test/t/warnings-master.opt:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  'loose' prefix is required on command line options which may be
  ignored if the plugin for which the option is intended is not
  installed/builtin to mysqld.
sql/mysqld.cc:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Do not enable the 'old-fashioned error log' when the user has
  '--help' specified on the command line. We do want the help
  output sent to the console. This fixes help output on Windows
  because it enables this option by default.

into  trift2.:/MySQL/M51/netware-cross-5.1


scripts/Makefile.am:
  Manual merge.

(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.


scripts/Makefile.am:
  Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
  a "make clean", this is essential for cross-builds.
  So move them from "CLEANFILES" to "DISTCLEANFILES".

 - validating current result files
 - updating with new features in information_schema / error messages
 - forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 
      5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed


BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  corrections to fooce order by on queries, replace time stamps with strings and enable the
  testing of referential_constraints table
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/memory_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated result file with order by selects, elimination of time stamps and selects
  of empty user (that we don't have anymore) and adding the testing 
  of referential_constraints table
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/ndb_views.result:
  confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/t/disabled.def:
  Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Added code to test for error in case of a trigger name that is to long
mysql-test/suite/funcs_1/views/views_master.inc:
  Correction to remove wrong '--eror' meaningless tag that generated warnings

into  linux.site:/home/omer/source/bld51_2


BitKeeper/deleted/.del-a_version_check.result:
  Auto merged
BitKeeper/deleted/.del-a_version_check.test:
  Auto merged
BitKeeper/deleted/.del-datadict_load.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
  Auto merged
BitKeeper/deleted/.del-disabled.def~1:
  Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
  Auto merged
BitKeeper/deleted/.del-innodb_trig_08.result:
  Auto merged
BitKeeper/deleted/.del-innodb_views.result:
  Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
  Auto merged
BitKeeper/deleted/.del-memory_trig_08.result:
  Auto merged
BitKeeper/deleted/.del-memory_views.result:
  Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
  Auto merged
BitKeeper/deleted/.del-myisam_trig_08.result:
  Auto merged
BitKeeper/deleted/.del-views_master.inc:
  Auto merged
BitKeeper/deleted/.del-innodb_func_view.result:
  manual merge - using local file
BitKeeper/deleted/.del-memory_func_view.result:
  manual merge - using local file
BitKeeper/deleted/.del-myisam_func_view.result:
  manual merge - using local file
BitKeeper/deleted/.del-myisam_views.result:
  manual merge - using local file

into  linux.site:/home/omer/source/bld50_2

source tarball, this is essential for cross builds, like for NetWare.


scripts/Makefile.am:
  On a fast build machine, both the source (mysql_fix_privilege_tables.sql) 
  and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
  (granularity is one second only, may be too coarse).
  If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
  which fails in a cross build, like for NetWare.
  
  Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.

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

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


scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

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


CMakeLists.txt:
  Auto merged

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

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


CMakeLists.txt:
  Auto merged

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

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

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


scripts/Makefile.am:
  Auto merged

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


scripts/Makefile.am:
  Auto merged

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


support-files/mysql.spec.sh:
  Auto merged

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


support-files/mysql.spec.sh:
  SCCS merged

support-files/mysql.spec.sh:
  Man pages may/will be compressed, so the file name needs trailing '*' to cover '.gz'.

CMakeLists.txt:
  Generate map files for executables

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


libmysqld/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
client/Makefile.am:
  Merge does not fit - to be done manually.

client/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
  After a backslash (to mark a continuation line) there must not be a trailing blank.

  Fix compiler warnings,
  Fix help output - this fixes im test failures.
  Fix incomplete change of SET plugin vars to ulonglong.
  Allow ER() to work without crashing when errmsg.sys has not been loaded.


include/mysql/plugin.h:
  wl2936
    slip in const modifier for default values,
    this removes compiler warnings when assigning a string const as default value.
sql/derror.cc:
  WL2936
    Allow init_errmessage() to return upon failure.
    Initialize errmesg to an array of empty strings if it failed to load errmsg.sys
sql/mysqld.cc:
  wl2936
    Include Ingo's compiler-warnings fix.
    If init_errmessage() failed to load errmsg.sys, abort.
    Failure to set working directory not fatal when '--help' is specified, as
    server will terminate anyway after displaying help information.
sql/sql_plugin.cc:
  wl2936
    complete change of SET vars from ulong to ulonglong.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/item_func.h:
  Auto merged

  Run master init scripts also for --embedded-server


mysql-test/mysql-test-run.pl:
  Run master init scripts also for --embedded-server

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


sql/item_func.h:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


sql/item_func.h:
  Auto merged

 - validated current result files
 - forced order by and removed time stamps 
removed a_version files (since do not make sense now when suite is in the main tree)
Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered
      while performing this update) - tests should run clean once bug is fixed


BitKeeper/deleted/.del-a_version_check.test:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings
BitKeeper/deleted/.del-memory_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/memory_views.warnings
BitKeeper/deleted/.del-myisam_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  corrections to force order by on queries and replace time stamps with strings
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file with order bu selects, elimination of time stamps 
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
  confirming existing results as correct ones - returned results are correct, 
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file with order bu selects, elimination of time stamps 
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/memory_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
  confirming existing results as correct ones - returned results are correct, 
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file with order bu selects, elimination of time stamps 
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
  confirming existing results as correct ones - returned results are correct, 
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/t/disabled.def:
  Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/views/views_master.inc:
  removed invalid -- lines generating warning files

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged

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


mysql-test/r/olap.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/lib/mtr_report.pl:
  Auto merged
sql/sql_table.cc:
  Manual merge

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

mysql-test/r/mysqldump.result:
  Fix braindead bad merge
mysql-test/t/mysqldump.test:
  Fix braindead bad merge