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

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

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


mysql-test/t/openssl_1.test:
  Auto merged

mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster

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

#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.

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

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

- 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  polly.local:/home/kaa/src/maint/mysql-5.0-maint

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

extra/yassl/src/ssl.cpp:
  Import patch yassl.diff

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


sql/log.cc:
  Auto merged

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

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

 - Turn off verification of peer if both ca_path and ca_file is null
   i.e from only passing --ssl-key=<client_key> and --ssl-cert=<client_cert>
   to the mysql utility programs.
   The server will authenticate the client accoring to GRANT tables
   but the client won't authenticate the server 


mysql-test/r/openssl_1.result:
  Update result file
mysql-test/t/openssl_1.test:
  Test that it's possible to connect with --ssl-ca set to /dev/null
vio/viosslfactories.c:
  Turn off verification of peer if both ca_file and ca_path is NULL

Remove strange comment
Add run_query function 

Improve comments

- 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.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.

Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.


mysys/my_malloc.c:
  Pass ME_NOREFRESH flag to an error handler in my_malloc() in case of memory allocation failure, so that it gets logged to the error log.
mysys/safemalloc.c:
  Pass ME_NOREFRESH flag to an error handler in _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.

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.

Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).

Add tests for all MBR* functions for various combinations of shapes, lines and points.


mysql-test/include/gis_generic.inc:
  Add tests & checks for bug #24563 and bug #24588 - some GIS functions missing in
  5.1; many GIS functions not tested; Overlaps() function was incorrect when MBR shifted
  only along one axis; Overlaps() needs to take dimension of shape into account.
mysql-test/r/archive_gis.result:
  Update test results.
mysql-test/r/bdb_gis.result:
  Update test results.
mysql-test/r/gis.result:
  Update test results.
mysql-test/r/innodb_gis.result:
  Update test results.
mysql-test/r/ndb_gis.result:
  Update test results.
mysql-test/t/gis.test:
  Add tests & checks for bug #24563 and bug #24588 - some GIS functions missing in
  5.1; many GIS functions not tested; Overlaps() function was incorrect when MBR shifted
  only along one axis; Overlaps() needs to take dimension of shape into account.
sql/spatial.h:
  Add MBR::dimension() (map MBR to integral dimension: point -> 0, line -> 1,
  polygon -> 2, invalid -> -1)
  
  Fix MBR::overlaps() to handle MBRs which are shifted on one dimension only, and to
  take MBR dimension into account.  Also, test both within() and contains() predicates (so
  that overlaps(a, b) == overlaps(b, a)).

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

 - Improve error handling for "out of memory" problems when master is
   sending logs to slave. If memory allocation fails the log should
   now  report error "memory allocation failed reading log event"  


sql/log_event.cc:
  Return LOG_READ_MEM from "Log_event::read_log_event" if memory
  allocation  fails.

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