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


BitKeeper/deleted/.del-bdb_gis.result:
  Auto merge
mysql-test/include/gis_generic.inc:
  Auto merge
mysql-test/r/archive_gis.result:
  ?
  Auto merge
mysql-test/r/innodb_gis.result:
  Auto merge
mysql-test/r/ndb_gis.result:
  Manual merge
mysql-test/r/strict.result:
  Auto merge
mysql-test/r/type_date.result:
  Auto merge
mysql-test/t/strict.test:
  Auto merge
sql/field.cc:
  Auto merge
sql/field.h:
  Auto merge

  Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes


mysql-test/include/gis_generic.inc:
  Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/archive_gis.result:
  Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/bdb_gis.result:
  Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/innodb_gis.result:
  Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/ndb_gis.result:
  Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes

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

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


mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

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

into  siva.hindu.god:/home/tsmith/m/inno/mar28/51


storage/innobase/dict/dict0dict.c:
  null merge
storage/innobase/os/os0file.c:
  null merge
storage/innobase/row/row0undo.c:
  null merge

Bug #27381: InnoDB exits when attempting to rename table to non-existant database
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().


mysql-test/t/innodb.test:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1373:
  Port r1372 from branches/5.0: Merge a change from MySQL AB, and remove
  the innodb_gis test case.
  
  ChangeSet
    2007/02/19 13:57:06+03:00 kaa@polly.local
    Bug#18743: Several test cases fails if "classic" configuration in 5.0
    The problem happened because those tests were using "cp932" and "ucs2"
    without checking whether these character sets are available.
    This fix moves test parts to make character set specific parts be
    tested only if they are:
    - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
    - some parts were moved to the newly added tests "innodb-ucs2.test",
    "mysqlbinglog-cp932.test" and "sp-ucs2.test"
  
  mysql-test/t/innodb.test
    2007/02/19 13:57:02+03:00 kaa@polly.local +0 -222
    Moved ucs2-specific test cases to innodb-ucs2.test
storage/innobase/Makefile.am:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1353:
  Makefile.am: EXTRA_DIST: Add the grammar source files to the
  source distribution of MySQL.
storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1350:
  Lock the data dictionary during rollback.  This removes the rare
  debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
  dict_table_get_on_id() after the rollback following crash recovery.
storage/innobase/handler/ha_innodb.cc:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1377:
  Add static qualifiers to some symbols in ha_innodb.cc that are not
  referenced from other modules.
  
  
  Revision r1380:
  Remove ha_innobase::last_query_id and references to thd->query_id.
  
  MySQL calls external_lock at the beginning and end of a statement
  when it is not calling start_stmt or commit or rollback.  Thus,
  statement boundaries can be (and are already) detected without
  monitoring thd->query_id.
  
  The function innobase_commit() seemingly lacks the call to
  innobase_release_stat_resources(), which should be called at
  the end of every SQL statement.  The call was replaced by
  equivalent statements by Vadim Tkachenko when he implemented
  innodb_commit_concurrency in MySQL 5.0:
  
  http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
  
  
  Revision r1355:
  class ha_innobase: Replace statistic_increment() with ha_statistic_increment().
  
  ha_innobase::change_active_index(): Do not call current_thd unless
  UNIV_DEBUG is defined.
  
  
  Revision r1369:
  Merge a change from MySQL AB:
  
  ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
  Bug #26598: Create variable to allow turning off of statistic gathering
  on metadata commands
  
  Add innodb_stats_on_metadata option, which enables gathering
  index statistics when processing metadata commands such as
  SHOW TABLE STATUS.  Default behavior of the server does not
  change (this option is enabled by default).
  
  
  Revision r1342:
  Minor cleanup in ha_innodb.cc.
  
  Remove the unused constants HA_INNOBASE_ROWS_IN_TABLE and
  HA_INNOBASE_RANGE_COUNT.  Declare innobase_active_counter static.
  
  
  Revision r1381:
  innobase_commit(): Correct the comments and formatting that were broken when
  innodb_commit_concurrency was implemented.
  
  
  Revision r1360:
  Minor cleanup.
  
  innobase_query_caching_of_table_permitted(): Make static.
  
  ha_innobase::register_query_cache_table(): Move the function
  definition from ha_innodb.h to ha_innodb.cc.  Add comments.
storage/innobase/handler/ha_innodb.h:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1377:
  Add static qualifiers to some symbols in ha_innodb.cc that are not
  referenced from other modules.
  
  
  Revision r1380:
  Remove ha_innobase::last_query_id and references to thd->query_id.
  
  MySQL calls external_lock at the beginning and end of a statement
  when it is not calling start_stmt or commit or rollback.  Thus,
  statement boundaries can be (and are already) detected without
  monitoring thd->query_id.
  
  The function innobase_commit() seemingly lacks the call to
  innobase_release_stat_resources(), which should be called at
  the end of every SQL statement.  The call was replaced by
  equivalent statements by Vadim Tkachenko when he implemented
  innodb_commit_concurrency in MySQL 5.0:
  
  http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
  
  
  Revision r1369:
  Merge a change from MySQL AB:
  
  ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
  Bug #26598: Create variable to allow turning off of statistic gathering
  on metadata commands
  
  Add innodb_stats_on_metadata option, which enables gathering
  index statistics when processing metadata commands such as
  SHOW TABLE STATUS.  Default behavior of the server does not
  change (this option is enabled by default).
  
  
  Revision r1360:
  Minor cleanup.
  
  innobase_query_caching_of_table_permitted(): Make static.
  
  ha_innobase::register_query_cache_table(): Move the function
  definition from ha_innodb.h to ha_innodb.cc.  Add comments.
storage/innobase/include/trx0trx.h:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1344:
  Rename the Boolean field trx->type to trx->is_purge
  and remove the constants TRX_USER and TRX_PURGE.
  
  
  Revision r1343:
  trx_sig_struct: Remove state.  It is always assigned to TRX_SIG_WAITING
  and never tested.
storage/innobase/os/os0file.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1352:
  Fix typo in comment in os/os0file.c
  
  Approved by:	heikki
  
  
  
  Revision r1366:
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().
  
  Approved by:	Heikki
storage/innobase/row/row0undo.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1350:
  Lock the data dictionary during rollback.  This removes the rare
  debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
  dict_table_get_on_id() after the rollback following crash recovery.
storage/innobase/trx/trx0purge.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1344:
  Rename the Boolean field trx->type to trx->is_purge
  and remove the constants TRX_USER and TRX_PURGE.
storage/innobase/trx/trx0trx.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1344:
  Rename the Boolean field trx->type to trx->is_purge
  and remove the constants TRX_USER and TRX_PURGE.
  
  
  Revision r1343:
  trx_sig_struct: Remove state.  It is always assigned to TRX_SIG_WAITING
  and never tested.

Bug #27381: InnoDB exits when attempting to rename table to non-existant database
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().


innobase/dict/dict0dict.c:
  Apply innodb-5.0-ss1372 snapshot
  
  Revision r1351:
  branches/5.0: Merge r1350 from trunk:
  
  Lock the data dictionary during rollback.  This removes the rare
  debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
  dict_table_get_on_id() after the rollback following crash recovery.
innobase/os/os0file.c:
  Apply innodb-5.0-ss1372 snapshot
  
  Revision r1354:
  branches/5.0: Merge r1352 from trunk:
  (also make indentation the same as in 5.1 to ease further merges)
  
  Fix typo in comment in os/os0file.c
  
  
  
  Revision r1370:
  branches/5.0: Merge r1366 from trunk:
  
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().
innobase/row/row0undo.c:
  Apply innodb-5.0-ss1372 snapshot
  
  Revision r1351:
  branches/5.0: Merge r1350 from trunk:
  
  Lock the data dictionary during rollback.  This removes the rare
  debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
  dict_table_get_on_id() after the rollback following crash recovery.

#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode

Problems: 
1. storing a string to an integer field we don't check 
   if strntoull10rnd() returns MY_ERRNO_EDOM error.
   Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
   Fix: use strntoull10rnd() instead.


mysql-test/r/strict.result:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
    - test result.
mysql-test/r/type_date.result:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
    - test result.
mysql-test/r/type_year.result:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
    - test result.
mysql-test/t/strict.test:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
    - test case.
mysql-test/t/type_year.test:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
sql/field.cc:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
    - Field_num::get_int() method introduced. It converts a string to integer
      then check errors and bounds.
    - similar Field_tiny::store(const char...),  Field_short::store(const char...),
      Field_medium::store(const char...), Field_long::store(const char...)
      rewritten, now they just call Field_num::get_int() then store value returned.
    - Field_num::check_int() simplified.
    - Field_year::store(const char...) now uses strntoull10rnd() and properly checks
      errors returned.
sql/field.h:
  Fix for bugs
  #27176: Assigning a string to an year column has unexpected results
  #26359: Strings becoming truncated and converted to numbers under STRICT mode
   - check_int() moved to Field_num.
   - get_int() introduced.

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/include/gis_generic.inc:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
mysql-test/r/innodb_gis.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
  Auto merged
sql/log.cc:
  Auto merged

sql/log.cc:
  Change print_buffer_to_nt_eventlog() to take size_t instead of int/uint for buffer sizes

Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly


mysql-test/r/archive_gis.result:
  update test result
mysql-test/r/bdb_gis.result:
  update test result
mysql-test/r/innodb_gis.result:
  update test result
mysql-test/r/ndb_gis.result:
  update test result

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


sql/log.cc:
  Manual merge

sql/log.cc:
  define print_buffer_to_file only ifdef EMBEDDED_LIBRARY, to avoid "defined but not used" warning

into  siva.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/include/gis_generic.inc:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
mysql-test/r/innodb_gis.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
sql/log.cc:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
  Auto merged

- Add primary key to test table, so NDB with binlog doesn't complain
- Add extra results for bdb_gis.result


mysql-test/include/gis_generic.inc:
  Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
  - Add primary key to test table, so NDB with binlog doesn't complain
mysql-test/r/archive_gis.result:
  update test results
mysql-test/r/bdb_gis.result:
  update test results
mysql-test/r/innodb_gis.result:
  update test results
mysql-test/r/ndb_gis.result:
  update test results

into  siva.hindu.god:/home/tsmith/m/bk/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/maint/51

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

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

extra/yassl/include/lock.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.hpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/algorithm.hpp:
  Import patch yassl.diff

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

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


sql/log.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490


sql/log.cc:
  Manual merge, the -5 hack is not needed anymore

Add the --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG
to REPAIR, ANALYZE, and OPTIMIZE commands.

Use this option when these SQL commands should not be sent to
replication slaves, nor run when using the binary logs for recovery
from backup


client/client_priv.h:
  Add OPT_WRITE_BINLOG client option
client/mysqlcheck.c:
  Add --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG to REPAIR, ANALYZE, and OPTIMIZE commands.

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

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


mysys/my_malloc.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged

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


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff

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


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

Remove strange comment
Add run_query function 

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


mysql-test/lib/mtr_process.pl:
  Auto merged

Improve comments

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


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged

- Change 'print_buffer_to_nt_event_log' to overwrite the string
if the buffer is not long enough to hold the ending CR/LF's
- Make functions static
- Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
 never to use "new"


sql/log.cc:
  -Change 'print_buffer_to_nt_event_log' to overwrite the string
  if the buffer is not long enough to hold the ending CR/LF's
  - Make functions static
  - Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
   never to use "new"

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


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