into  damien-katzs-computer.local:/Users/dkatz/mysql51


client/mysqldump.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  damien-katzs-computer.local:/Users/dkatz/50_dump

into  mysql.com:/home/ram/work/b28436/b28436.5.1

Problem: there is an ASSERT() in the Log_event::read_log_event() checking the integrity 
of the event's data that may fail.
Fix: move the assert's condition to an explicit check.


mysql-test/r/ctype_cp932_binlog_stm.result:
  Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
    - test result.
mysql-test/t/ctype_cp932_binlog_stm.test:
  Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
    - test case.
sql/log_event.cc:
  Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
    - assert's condition moved to the explicit integrity check.

into  mysql.com:/home/ram/work/b28631/b28631.5.1


sql/field.h:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/bug24611/my51-bug24611


sql/mysqld.cc:
  Auto merged

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

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

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


sql/field.h:
  Auto merged

Moved size_of() from Field_double to Field_real in order to properly clone Field_float and Field_double. This is to fix PushBuild failures introduced by the patch for bug #28121.


sql/field.h:
  Moved size_of() from Field_double to Field_real in order to properly clone Field_float and Field_double.

Problem: altering a bit field we use Field::is_equal() to check if the bit 
field is changed. Comparing the field type is not enough for bit fields.
Fix: add proper Field_bit::is_equal() that compares the field lengths as well.



mysql-test/r/type_bit.result:
  Fix for bug #28631: Bit index creation failure after alter
    - test result.
mysql-test/t/type_bit.test:
  Fix for bug #28631: Bit index creation failure after alter
    - test result.
sql/field.cc:
  Fix for bug #28631: Bit index creation failure after alter
    - Field_bit::is_equal() added.
sql/field.h:
  Fix for bug #28631: Bit index creation failure after alter
    - Field_bit::is_equal() added.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


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

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


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

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597


mysys/my_init.c:
  Auto merged

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


strings/strtod.c:
  Auto merged

This is for bug #28121.


strings/strtod.c:
  Don't use log_01[] in my_strtod() to avoid loss of precision.

 - Don't delete anything if starting dirty


mysql-test/mysql-test-run.pl:
  Don't delete anything if starting dirty

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


include/m_string.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/strtod.c:
  Auto merged

include/m_string.h:
  Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.
sql/field.cc:
  Avoid the warning on Windows.
strings/strtod.c:
  Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/strtod.c:
  Auto merged

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/strtod.c:
  Auto merged

This is for bug #28121.


mysql-test/r/type_float.result:
  Changed the warning messages in the testcase to match 5.1 text.

into  polly.local:/home/kaa/src/maint/bug28121/my51-bug28121


include/m_string.h:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/init.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.

When storing a large number to a FLOAT or DOUBLE field with fixed length, it could be incorrectly truncated if the field's length was greater than 31.

This patch also does some code cleanups to be able to reuse code which is common between Field_float::store() and Field_double::store().


include/m_string.h:
  Added declarations for log_10 and log_01 from strtod.c
mysql-test/r/type_float.result:
  Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
mysql-test/t/type_float.test:
  Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
sql/field.cc:
  Moved common code from Field_float::store() and Field_double:store() to Field_real::truncate()
  Fixed the algorithm to not truncate large input numbers if the field length is greater than 31.
  Fixed rounding to not depend on FLT_MAX/DBL_MAX constants.
sql/field.h:
  Moved not_fixed member from Field_double to Field_real to allow code reuse between Field_float::store() and Field_double::store()
  Added truncate() method to Field_real which is used by both Field_float and Field_double
sql/init.cc:
  log_10[] and log_01[] are now defined as statical arrays in strtod.c, no need to pre-computed them.
sql/item_cmpfunc.cc:
  log_01[] now starts from 1e0, not from 1e-1 for consistency.
sql/mysql_priv.h:
  Moved log_10[] and log_01[] from mysqld.cc to libmystrings.
sql/mysqld.cc:
  Moved log_10[] and log_01[] from mysqld.cc to libmystrings.
strings/strtod.c:
  Define and use log_10[] and log_01[] as static arrays of constants instead of values pre-computed at startup.

  
  fixed by using flush logs, dumping, then doing PURGE MASTER LOGS TO 'binfile', instead
of deleting the log files at the beginning.
  
  NOTE: previously the delete-master-logs  would reset the log names back to
filename.00001. Now the trailing number doesn't get reset. This may need to be
documented. 


client/mysqldump.c:
  changed the code the --delete-master-logs option is used from this:
      
      take locks
      delete bin logs
      do dump (if this is a lock-based dump)
      release locks
      do dump (if this is a consistent-read-dump)
      
   to this:
      
      take locks
      flush logs
      remember the name of the new log
      do dump (if this is a lock-based dump)
      release locks
      do dump (if this is a consistent-read-dump)
      fflush output sql file if specified, to ensure the backup is commited to disk
      --- yes, dump succeeded ---
      do PURGE MASTER LOGS TO up to the new log

On some Linux distributions with both LinuxThreads and NPTL glibc versions available, statically built binaries can crash, because linker defaults to LinuxThreads when linking statically, but calls to external libraries (like libnss) are resolved to NPTL versions.

Since there is nothing we can do in the code to work that around, just give user an advice on how to fix that, if a crash happened on such a binary/OS combination.


sql/mysqld.cc:
  Advise a user on possible solutions in case of a crash in a statically built binary on a system with both LinuxThreads and NPTL available.

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


sql/net_serv.cc:
  Auto merged

 - Add checks to make sure net has a vio assigned
 - For example bootstrap will create a fake "net" with vio
   set to 0 


sql/net_serv.cc:
  Add checks to make sure net has a vio assigned

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

Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.


mysql-test/r/binlog_stm_ps.result:
  New BitKeeper file ``mysql-test/r/binlog_stm_ps.result''
mysql-test/t/binlog_stm_ps.test:
  New BitKeeper file ``mysql-test/t/binlog_stm_ps.test''

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


include/mysql_com.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

 - Make the two "my_net_set*" function only visible when included
   from my_global.h


include/mysql_com.h:
  Make the two "my_net_set*" functions only
  visible when included from my_global.h

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

into  mysql.com:/home/ram/work/b26842/b26842.5.1