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


sql/sql_select.cc:
  Auto merged

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


mysql-test/r/ctype_ucs2_def.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
mysql-test/t/ctype_ucs2_def.test:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

Problem:

HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.

As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug #27643 contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.

Solution:

- ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
- return a proper error from create_myisam_from_heap() when conversion fails.


mysql-test/r/ctype_ucs2_def.result:
  Added a testcase for bug #27643.
mysql-test/r/heap_hash.result:
  Added a testcase for bug #27643.
mysql-test/t/ctype_ucs2_def.test:
  Added a testcase for bug #27643.
mysql-test/t/heap_hash.test:
  Added a testcase for bug #27643.
sql/sql_select.cc:
  Return an appropriate error instead of 'table is full' when conversion from MEMORY to MyISAM fails.
strings/ctype-bin.c:
  Added my_hash_sort_8bit_bin() which ignores trailing spaces when calculating hashes, and is now used for VARCHAR columns instead of my_hash_sort_bin().
strings/ctype-mb.c:
  Ignore trailing spaces when calculating a string hash in my_hash_sort_mb_bin().
strings/ctype-ucs2.c:
  Ignore trailing spaces when calculating a string hash in my_hash_sort_ucs2_bin().

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


strings/strtod.c:
  Auto merged

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


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

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


client/mysqldump.c:
  Auto merged
strings/strtod.c:
  Auto merged

  Fix harmless typo (caught thanks to warning)


client/mysqldump.c:
  Fix harmless typo (caught thanks to warning)

  Fix harmless typo (caught thanks to warning)


client/mysqldump.c:
  Fix harmless typo (caught thanks to warning)

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

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


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
strings/strtod.c:
  Auto merged

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


strings/strtod.c:
  Auto merged

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

Got rid of log_01[], because we don't really need it. Division and log_10[] can always be used instead, which is also a more precise way.

This is for bug #28121.


include/m_string.h:
  Got rid of log_01[], because we don't really need it.
sql/item_cmpfunc.cc:
  Got rid of log_01[], because we don't really need it.
strings/strtod.c:
  Got rid of log_01[], because we don't really need it.

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.