into  loke.(none):/home/knielsen/devel/mysql-5.1-new-maint

into  loke.(none):/home/knielsen/devel/mysql-5.1-new-maint


strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  SCCS merged

An integer overflow in number->string conversion caused completely
wrong output of the number LONGLONG_MIN with gcc 4.2.1.

Fixed by eliminating the overflow, using only operations that are
well-defined in ANSI C.


strings/ctype-simple.c:
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.
strings/ctype-ucs2.c:
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.
strings/int2str.c:
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.
strings/longlong2str.c:
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.

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


client/mysqlcheck.c:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/t/mysqlcheck.test:
  Auto merged

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


client/mysqlcheck.c:
  Auto merged

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


client/mysqlcheck.c:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/t/mysqlcheck.test:
  manual merge.

names include backticks or blank

Problem: mysqlcheck doesn't escape backtick characters in the table names.

Fix: escape them.


client/mysqlcheck.c:
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
    - escape backtick characters in the table names.
mysql-test/r/mysqlcheck.result:
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
    - test result.
mysql-test/t/mysqlcheck.test:
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
    - test case.

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


sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/include/mix1.inc:
  will merge tests manually
mysql-test/r/innodb_mysql.result:
  will merge tests manually
mysql-test/r/key.result:
  will merge tests manually
mysql-test/t/key.test:
  will merge tests manually
include/my_base.h:
  manual merge.

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


sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  manual merge.
mysql-test/t/case.test:
  manual merge.
sql/item_cmpfunc.h:
  manual merge.

JOIN, and ORDER BY

Problem: improper maximum length calculation of the CASE function leads to 
decimal value truncation (storing/retrieving decimal field values).

Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
of the CASE function.


mysql-test/r/case.result:
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
    - test result.
mysql-test/t/case.test:
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
    - test case.
sql/item_cmpfunc.cc:
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
    - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.
sql/item_cmpfunc.h:
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
    - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

file .\ha_innodb.

Problem: if a partial unique key followed by a non-partial one we declare
the second one as a primary key.

Fix: sort non-partial unique keys before partial ones.


include/my_base.h:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - sort unique keys that don't contain partial segments before other keys:
        set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
        use it in the sort_keys();
mysql-test/r/innodb_mysql.result:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - test result.
mysql-test/r/key.result:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - test result.
mysql-test/t/innodb_mysql.test:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - test case.
mysql-test/t/key.test:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - test case.
sql/sql_table.cc:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - sort unique keys that don't contain partial segments before other keys:
        set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
        use it in the sort_keys();
sql/structs.h:
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
    - sort unique keys that don't contain partial segments before other keys:
        set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
        use it in the sort_keys();

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysys/my_write.c:
  Auto merged

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

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

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

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

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/set_var.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysys/my_write.c:
  Auto merged

Problem: we skip views perfoming --fix-table-names.

Fix: rename views as well.


client/mysqlcheck.c:
  Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
    - rename views performing --fix-table-names as well.
mysql-test/r/mysqlcheck.result:
  Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
    - test result.
mysql-test/t/mysqlcheck.test:
  Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
    - test case.

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint

some platforms

Since the behavior of write(fd, buf, 0) is undefined, it may fail with
EFAULT on some architectures when buf == NULL. The error was propagated
up to a caller, since my_write() code did not handle it properly.

Fixed by checking the 'number of bytes' argument in my_write() and
returning before calling the write() system call when there is nothing
to write.


mysys/my_write.c:
  Return from my_write() before calling the write() system call when the
  number of bytes to be written is 0, since the behavior of write() in
  this case is not portable.

into  mysql.com:/home/ram/work/b31615/b31615.4.1

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


sql/set_var.cc:
  Auto merged

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

separate checking.

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

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


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/set_var.cc:
  I will apply the patch after auto-merging

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


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged

into  pilot.mysql.com:/data/msvensson/mysql/bug30560/my51-bug30560


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1

into  mysql.com:/scratch/tnurnberg/20901/51-20901

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

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

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