- Change check for return value of 'SSL_CTX_set_cipher_list'
   in order to handle 0 as error setting cipher.
 - Thanks to Dan Lukes for finding the problem!


mysql-test/r/openssl_1.result:
  Update result
mysql-test/t/openssl_1.test:
  Add test for setting ssl-cipher to be used
vio/viosslfactories.c:
  Change error handling of SSL_CTX_set_cipher_list to
  detect 0 as an error

Improve comments

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

 - Add extra test case from bug#27073
 - Change "if" to be optimized for count > 0


mysql-test/r/func_str.result:
  Add test case from bug#27073
mysql-test/t/func_str.test:
  Add test case from bug#27073
sql/item_strfunc.cc:
  Change the if statemnet to be optimized for the normal case where count > 0

BitKeeper/deleted/.del-ssl_des-master.opt:
  Delete: mysql-test/t/ssl_des-master.opt

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

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

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


sql/sql_show.cc:
  Auto merged

Bug#27047[partial]: INFORMATION_SCHEMA table cannot have BIGINT \
	fields

No Information_schema table has ever needed floating-point data 
before.  Transforming all floating point to a string and back to a
number causes a real data problem on Windows, where the libc may 
pad the exponent with more leading zeroes than we expect and the
significant digits are truncated away.

This also makes interpreting an unimplemented type as a string into
a fatal error in debug builds.  Thus, we will catch problems when we
try to use those types in new I_S tables.


sql/sql_show.cc:
  Add floating-point types to information_schema output.

into  mysql.com:/home/ram/work/b25301/b25301.5.0


sql-common/my_time.c:
  Auto merged

  
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.


client/mysqldump.c:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - use complete_insert instead of opt_complete_insert.
mysql-test/r/mysqldump.result:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test case.

Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.

into  damiendev.:C:/build/dev50

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

extra/yassl/README:
  Import patch yassl.diff
extra/yassl/include/buffer.hpp:
  Import patch yassl.diff
extra/yassl/include/crypto_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_imp.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_int.hpp:
  Import patch yassl.diff
extra/yassl/src/crypto_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/README:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/algebra.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/des.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hash.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hmac.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modarith.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/rsa.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/sha.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/type_traits.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aes.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/hash.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/sha.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

 - Add output path for slow queries as well 


mysql-test/mysql-test-run.pl:
  Send queries to var/log/$type.log and slow queries to var/log/$type-slow.log

 - Rework the windows implementation in 'create_temp_file' to be
   thread safe by using GetTempFileName instad of fiddling
   with "environ"


mysys/mf_tempfile.c:
  - Update windows implementation  of 'create_temp_file' to use
    GetTempFileName in favor of fiddeling with "environ" in an unsafe way
  - Remove the implementation that is supposed to be used if not
    windows, not mkstemp or tmpnam exists as it not longer compiles it
    can't be used anywhere.
  - Update function comment for 'create_temp_file'
mysys/my_static.c:
  Remove unused variable
mysys/my_static.h:
  Remove unused variable

Apply the following InnoDB snapshots:
innodb-5.0-ss1319
innodb-5.0-ss1331
innodb-5.0-ss1333
innodb-5.0-ss1341

Fixes:
- Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
  At low transaction isolation levels we let each consistent read set
  its own snapshot.
- Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
  On Windows ut_usectime returns secs and usecs relative to the UNIX
  epoch (which is Jan, 1 1970).

- Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
  lock_deadlock_recursive(): When the search depth or length is exceeded,
  rewind lock_latest_err_file and display the two transactions at the
  point of aborting the search.

- Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
  Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
  there is a foreign key constraint ON ... SET NULL.

- Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
  The bug could be reproduced as follows:

  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.

  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.

  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.


innobase/dict/dict0dict.c:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1317:
  branches/5.0: Port r1316 from trunk:
  
  Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
  there is a foreign key constraint ON ... SET NULL.  (Bug #25927)
  
  dict_foreign_find_index(): Add paramettter check_null.
  
  dict_foreign_add_to_cache(): Do not allow ON DELETE SET NULL
  or ON UPDATE SET NULL if any of the referencing columns are declared NOT NULL.
innobase/include/rem0rec.ic:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1339:
  branches/5.0: Merge r1338 from trunk:
  
  rec_offs_nth_size(): Treat n==0 as a special case.  (Bug #26835)
innobase/include/sync0sync.ic:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1293:
  branches/5.0: Fixed inline asm code, it didn't work with GCC > ver 3.x.
innobase/lock/lock0lock.c:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1331:
  branches/5.0: Merge r1330 from trunk:
  
  lock_deadlock_recursive(): When the search depth or length is exceeded,
  rewind lock_latest_err_file and display the two transactions at the
  point of aborting the search.  (Bug #25494)
  
  
  Revision r1333:
  branches/5.0: Merge r1332 from trunk:
  
  lock_deadlock_recursive(): When aborting the search, display a note
  regardless of start->undo_no.  Otherwise, aborted searches may show
  up as genuine deadlocks.  This mistake was made in r1330.
innobase/srv/srv0srv.c:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1261:
  branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
  and usecs relative to the UNIX epoch (which is Jan, 1 1970).
innobase/ut/ut0ut.c:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1261:
  branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
  and usecs relative to the UNIX epoch (which is Jan, 1 1970).
mysql-test/r/innodb.result:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1319:
  branches/5.0: Port r1318 from trunk:
  
  Add a test case for r1316 (Bug #25927).
  
  
  Revision r1328:
  branches/5.0: mysql-test: Merge changes from MySQL AB.
  
  
  Revision r1341:
  branches/5.0: Merge r1340 from trunk:
  
  innodb.test, innodb.result: Add test case for Bug #26835.
  The bug could be reproduced as follows:
  
  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.
  
  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.
  
  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
  
  Revision r1284:
  Merge changes from MySQL AB:
  
  ChangeSet
    2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
    bug #22682 Test fails --without-geometry
    geometry dependent parts moved to proper .test files
  
  mysql-test/r/innodb.result
    2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
    result fixed
  
  mysql-test/r/innodb_gis.result
    2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
    result fixed
  
  mysql-test/t/innodb.test
    2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
    HAVE_GEOMETRY dependent part moved to innodb_gis.test
  
  mysql-test/t/innodb_gis.test
    2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
    HAVE_GEOMETRY dependent part moved here from innodb.test
  
  
  Revision r1186:
  dict_load_foreign(): Use a local variable instead of the 10-bit field
  foreign->n_fields in order to preserve ON UPDATE CASCADE and
  ON DELETE CASCADE flags.  For some reason, gcc does not warn about
  shifting a 10-bit field to right by 24 bits.  (Bug #24741)
  
  This bug was introduced while reducing the memory footprint of the
  InnoDB data dictionary (Bug #20877).
  
  innodb.test, innodb.result: Add a test case.
  
  
  Revision r1318:
  Add a test case for r1316 (Bug #25927).
  
  
  Revision r1340:
  innodb.test, innodb.result: Add test case for Bug #26835.
  The bug could be reproduced as follows:
  
  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.
  
  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.
  
  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
mysql-test/t/innodb.test:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1279:
  branches/5.0: Merge changes from MySQL AB:
  
  ChangeSet
    2006/11/20 22:42:06+02:00 monty@mysql.com 
    Remove compiler warnings
    (Mostly in DBUG_PRINT() and unused arguments)
    Fixed bug in query cache when used with traceing (--with-debug)
    Fixed memory leak in mysqldump
    Removed warnings from mysqltest scripts (replaced -- with #)
  
  mysql-test/t/innodb.test
    2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
    Remove mysqltest warnings
  
  sql/ha_innodb.cc
    2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
    Fixed compiler warning
  
  
  Revision r1319:
  branches/5.0: Port r1318 from trunk:
  
  Add a test case for r1316 (Bug #25927).
  
  
  Revision r1328:
  branches/5.0: mysql-test: Merge changes from MySQL AB.
  
  
  Revision r1341:
  branches/5.0: Merge r1340 from trunk:
  
  innodb.test, innodb.result: Add test case for Bug #26835.
  The bug could be reproduced as follows:
  
  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.
  
  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.
  
  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
  
  Revision r1284:
  Merge changes from MySQL AB:
  
  ChangeSet
    2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
    bug #22682 Test fails --without-geometry
    geometry dependent parts moved to proper .test files
  
  mysql-test/r/innodb.result
    2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
    result fixed
  
  mysql-test/r/innodb_gis.result
    2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
    result fixed
  
  mysql-test/t/innodb.test
    2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
    HAVE_GEOMETRY dependent part moved to innodb_gis.test
  
  mysql-test/t/innodb_gis.test
    2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
    HAVE_GEOMETRY dependent part moved here from innodb.test
  
  
  Revision r1283:
  Merge changes from MySQL AB:
  
  ChangeSet
    2007/01/22 18:42:52+02:00 monty@mysql.com 
    Give warnings for unused objects
    Changed error message to be compatible with old error file
    Added new error message for new DUP_ENTRY syntax
  
  mysql-test/t/innodb.test
    2007/01/22 18:42:49+02:00 monty@mysql.com +14 -14
    Changed to use new error message
  
  
  Revision r1186:
  dict_load_foreign(): Use a local variable instead of the 10-bit field
  foreign->n_fields in order to preserve ON UPDATE CASCADE and
  ON DELETE CASCADE flags.  For some reason, gcc does not warn about
  shifting a 10-bit field to right by 24 bits.  (Bug #24741)
  
  This bug was introduced while reducing the memory footprint of the
  InnoDB data dictionary (Bug #20877).
  
  innodb.test, innodb.result: Add a test case.
  
  
  Revision r1318:
  Add a test case for r1316 (Bug #25927).
  
  
  Revision r1329:
  Merge changes from MySQL AB to mysql-test directives.
  The results are not affected.
  
  
  Revision r1340:
  innodb.test, innodb.result: Add test case for Bug #26835.
  The bug could be reproduced as follows:
  
  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.
  
  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.
  
  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
sql/ha_innodb.cc:
  NULL MERGE this to 5.1
  
  Apply the following InnoDB snapshots:
  innodb-5.0-ss1319
  innodb-5.0-ss1331
  innodb-5.0-ss1333
  innodb-5.0-ss1341
  
  Revision r1279:
  branches/5.0: Merge changes from MySQL AB:
  
  ChangeSet
    2006/11/20 22:42:06+02:00 monty@mysql.com 
    Remove compiler warnings
    (Mostly in DBUG_PRINT() and unused arguments)
    Fixed bug in query cache when used with traceing (--with-debug)
    Fixed memory leak in mysqldump
    Removed warnings from mysqltest scripts (replaced -- with #)
  
  mysql-test/t/innodb.test
    2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
    Remove mysqltest warnings
  
  sql/ha_innodb.cc
    2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
    Fixed compiler warning
  
  
  Revision r1280:
  branches/5.0: Merge a change from MySQL AB:
  
  ChangeSet
    2006/11/30 18:25:05+02:00 monty@mysql.com 
    Fixed portability issue in my_thr_init.c (was added in my last push)
    
    Fixed compiler warnings (detected by VC++):
    - Removed not used variables
    - Added casts
    - Fixed wrong assignments to bool
    - Fixed wrong calls with bool arguments
    - Added missing argument to store(longlong), which caused wrong store
    method to be called.
  
  sql/ha_innodb.cc
    2006/11/30 18:24:53+02:00 monty@mysql.com +0 -1
    Removed not used variable
  
  
  Revision r1260:
  branches/5.0: Fix for Bug# 21409. At low transaction isolation levels
  we let each consistent read set its own snapshot.
  
  
  Revision r1326:
  branches/5.0: Merge code from MySQL AB:
  
  ChangeSet@1.2417.3.1  2007-02-22 16:59:57+02:00  monty@mysql.fi
  
  Fixed compiler warnings (for linux and win32 and win64)

into  damiendev.:C:/build/dev50

Fixes to buffer overlows from long command line args, and unchecked dyn_str return codes. Also light refactoring.


client/mysqldump.c:
  Bug#26346 stack + buffer overrun in mysqldump
mysql-test/r/mysqldump.result:
  Bug#26346 stack + buffer overrun in mysqldump
mysql-test/t/mysqldump.test:
  Bug#26346 stack + buffer overrun in mysqldump

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

  fix test prg


ndb/test/ndbapi/testNodeRestart.cpp:
  fix test prg

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

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

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  recycle.(none):/src/bug27144/my50-bug27144

- Update test to run properly on Windows.


mysql-test/t/sp-destruct.test:
  Bug#27144 sp-destruct.test is disabled on Windows
  - Enabled test on Windows.
  - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
  with the mysqltest builtin commands.
  - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
  posix directory seperator for single test/result pair.

into  recycle.(none):/src/bug23736/my50-bug23736

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

    Additional fix for 2-node case


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
netware/Makefile.am:
  Manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged