into  four.local.lan:/WORK/mysql-5.1-build/src-clean

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


configure.in:
  Auto merged

as it may well happen with 32- vs 64-bit Linux systems.

This patch was proposed immediately with the report of
Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

Bug#31169 Test case does not check whether configuration contains feature tested


mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  Add check for partitioning feature.
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
  Add check for partitioning feature.

Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
= Adjust the files with expected results 


mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Updated result

into  four.local.lan:/WORK/mysql-5.1-build/src-clean

   Bug#31481 test suite parts: Many tests fail because of changed server error codes
   Bug#31243 Test "partition_basic_myisam" truncates path names
+ minor cleanup


mysql-test/suite/parts/inc/partition.pre:
  - Blow column file_list up to VARBINARY(10000)
     = Fix for Bug#31243 Test "partition_basic_myisam" truncates path names
  - Minor cleanup
    = remove reference to fixed bugs #17455, #19305
mysql-test/suite/parts/inc/partition_alter_1.inc:
  Adjust expected server error codes
mysql-test/suite/parts/inc/partition_check.inc:
  Adjust expected server error codes
mysql-test/suite/parts/inc/partition_syntax.inc:
  Minor cleanup
  = replace error numbers with error names
mysql-test/suite/parts/inc/partition_syntax_1.inc:
  Adjust expected server error codes
mysql-test/suite/parts/r/partition_alter1_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Updated results
mysql-test/suite/parts/r/partition_alter2_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Updated results
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Updated results
mysql-test/suite/parts/r/partition_alter4_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_alter4_myisam.result:
  Updated results
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Updated results
mysql-test/suite/parts/r/partition_engine_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Updated results
mysql-test/suite/parts/r/partition_syntax_innodb.result:
  Updated results
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Updated results

  Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results


mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated expected results
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Updated expected results
  Attention:
     The update does not prevent that the test has to be disabled.
     Reason: Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
mysql-test/suite/funcs_1/t/disabled.def:
  Disable ndb__datadict because of
  Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
  which will be fixed later.

into  alf.(none):/src/bug31289/my51-bug31289


CMakeLists.txt:
  Auto merged

tool error
- Move disable manifest generation commands to more global location.


CMakeLists.txt:
  Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
  tool error
  - Disable Manifests by default for VS 7 and 8.

2. Cleanup of test


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated expected results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated expected results
mysql-test/suite/funcs_1/views/views_master.inc:
  1. Fix for Bug#31237
     Typical changes:
        - Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
        - Partially refine the SELECT on the VIEW to get a reproducible result
  2. Cleanup of test
        - replace error numbers by names
        - remove comments and workarounds dedicated to now fixed bugs
        - minor fixes or improvements in comments
        - remove trailing spaces

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


storage/ndb/test/ndbapi/testScanFilter.cpp:
  Auto merged

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

into  production.mysql.com:/usersnfs/jperkin/bk/build/5.1


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0

were accidentally removed during a previous rototill of this
code.  Fixes bug#27692.
  
While it can be argued we should strive to provide a 'secure by
default' installation, this happens to be the setup currently
documented in the manual as the default, so defer changes that
improve security out of the box to a co-ordinated effort later
on.
  
For now, make a note about the test databases and anonymous user
in mysql_install_db and recommend that mysql_secure_installation
be ran for users wishing to remove these defaults.

[..re-commit of previously lost change..]


scripts/mysql_system_tables_data.sql:
  Add anonymous accounts.
scripts/mysql_install_db.sh:
  Point users at the mysql_secure_installation script.
mysql-test/mysql-test-run.pl:
  Add a comment where removing anonymous users.

   Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break


ndb/test/ndbapi/testScanFilter.cpp:
   Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break

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

  Added special handling of "mysql_install_db" and "mysql.server" scripts,
  find executables relative to the current directory.


scripts/make_binary_distribution.sh:
  Added special handling of "mysql_install_db" and "mysql.server" scripts,
  find executables relative to the current directory.

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


configure.in:
  5.0 version change does not affect 5.1 - "use local".

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

Add the cleanup by dropping the database 'track' in test "rpl_bug31076".


mysql-test/suite/rpl/r/rpl_bug31076.result:
  Fix bug#31150 "Test case does not cleanup":
  Drop the database 'track' which was newly created for this test.
mysql-test/suite/rpl/t/rpl_bug31076.test:
  Fix bug#31150 "Test case does not cleanup":
  Drop the database 'track' which was newly created for this test.

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

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

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

This is mysql-5.1.22-rc.


mysql-test/r/innodb_mysql.result:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_select.cc:
  Manual merge - the 31001 bug is already fixed.
mysql-test/include/mix1.inc:
  Manual merge - should not have conflicted at all.

   Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.


scripts/mysql_install_db.sh:
  Preliminary fix for
     Bug #30759  	mysql_install_db fails to set $extra_bindir properly in all cases.
  
  Provided by Daniel for the 5.1.22-rc build, to be superseded by a better patch when that is available.

into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build


Makefile.am:
  Auto merged
configure.in:
  Auto merged

  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir


Makefile.am:
  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
configure.in:
  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
pstack/Makefile.am:
  Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir

into  trift-lap.fambruehe:/MySQL/M51/antony-5.1


Makefile.am:
  Auto merged
configure.in:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Use most current version of test results.
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Use most current version of test results.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Use most current version of test results.
mysql-test/suite/funcs_1/r/ndb__datadict.result:
  Use most current version of test results.

  Use custom 'pkgduppdir'
mysql.server.sh:
  The server is installed in 'libexecdir'


scripts/Makefile.am:
  Use custom 'pkgduppdir'
scripts/make_binary_distribution.sh:
  Use custom 'pkgduppdir'
support-files/mysql.server.sh:
  The server is installed in 'libexecdir'

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

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

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

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


mysys/mf_tempfile.c:
  Auto merged

mysys/mf_tempfile.c:
  Try to avoid passing null as first parameter to GetTempFileName, since it's documented that it won't work.

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


scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

  Use 'make install' to create the package
Makefile.am:
  Added 'pkgsuppdir' to control location separately
  Pass on mandir and infodir
  Don't install headers


scripts/Makefile.am:
  Pass on mandir and infodir
scripts/make_binary_distribution.sh:
  Use 'make install' to create the package
support-files/Makefile.am:
  Added 'pkgsuppdir' to control location separately
cmd-line-utils/readline/Makefile.am:
  Don't install headers
cmd-line-utils/libedit/Makefile.am:
  Don't install headers