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


sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


sql/field.cc:
  Auto merged

Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.

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


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

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


mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/insert.result:
  SCCS merged
mysql-test/t/insert.test:
  SCCS merged

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


mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/insert.result:
  SCCS merged
mysql-test/t/insert.test:
  SCCS merged

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  SCCS merged

numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.


mysql-test/r/insert.result:
  Added test cases for bug #26788 and bug #31152.
mysql-test/t/cast.test:
  Removed --replace_result, since the result is now correct on Windows.
mysql-test/t/insert.test:
  Added test cases for bug #26788 and bug #31152.
mysql-test/t/type_float.test:
  Removed --replace_result, since the result is now correct on Windows.
mysql-test/t/variables.test:
  Removed --replace_result, since the result is now correct on Windows.
sql/field.cc:
  Rewrote the code that determines what 'precision' argument should be
  passed to sprintf() to fit the string representation of the input number
  into the field.
  We get finer control over conversion by pre-calculating the exponent, so
  we are able to determine which conversion format, 'e' or 'f', will be
  used by sprintf().

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


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

this has already been closed by a note in the manual, now we
complete this by a note in "mysqldump --help"


client/mysqldump.c:
  mention, in "mysqldump --help", of limitations reported as BUG#27850
  "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER"
  The new text is inspired from what the "mysqldump" section of the
  manual now says about --single-transaction:
  http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html

into  mysql.com:/misc/mysql/24907/51-24907


sql/sql_select.cc:
  Auto merged

post-merge fixes: some things work differently in 5.1


mysql-test/r/type_newdecimal.result:
  post-merge fix: 5.1 throws different warning here
sql/sql_select.cc:
  post-merge fix: signature has changed in 5.1

into  mysql.com:/misc/mysql/24907/50-24907


sql/sql_select.cc:
  Auto merged

into  mysql.com:/misc/mysql/24907/51-24907


mysql-test/r/type_newdecimal.result:
  manual merge
mysql-test/t/type_newdecimal.test:
  manual merge
sql/sql_select.cc:
  manual merge

Server failed in assert() when we tried to create a DECIMAL() temp field
with a scale of more than the allowed 30. Now we limit the scale to the
allowed maximum. A truncation warning is thrown as necessary.


mysql-test/r/type_newdecimal.result:
  Show that out of range DECIMAL temp fields will no longer
  stop the server with an assert.
mysql-test/t/type_newdecimal.test:
  Show that out of range DECIMAL temp fields will no longer
  stop the server with an assert.
sql/sql_select.cc:
  When creating DECIMAL() temp field, ascertain we stay within allowed
  limits. If not, truncate and warn.

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

into  mysql.com:/home/ram/work/mysql-5.1-maint


sql/unireg.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

sql/ha_myisam.cc:
  compiler warning fixed.
sql/unireg.cc:
  compiler warning fixed.

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

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


mysql-test/t/ps.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

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

 - Add debug queries


mysql-test/suite/rpl/t/rpl_ssl.test:
  Add additional queries to run when we detect that the number of queries between slave and master differs

and auto_increment keys

Problems: 
  1. ALTER TABLE ... ORDER BY... doesn't make sence if there's a 
     user-defined clustered index in the table.
  2. using a secondary index is slower than using a clustered one 
     for a table scan.

Fixes:
  1. raise a warning.
  2. use the clustered index.


mysql-test/include/mix1.inc:
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
    - test case.
mysql-test/r/innodb.result:
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
    - results adjusted.
mysql-test/r/innodb_mysql.result:
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
    - results adjusted.
mysql-test/r/join_outer_innodb.result:
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
    - results adjusted.
sql/sql_select.cc:
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
    - use the clustered index for a table scan (if any) as it's faster than
      using a secondary index.
sql/sql_table.cc:
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
    - ALTER TABLE ... ORDER BY doesn't make sence if there's a 
      user-defined clustered index in the table. Ignore it in such cases
      and raise a warning.

Problem: calling non-constant argument's val_xxx() methods 
in the ::fix_length_and_dec() is inadmissible.

Fix: call the method only for constant arguments.


mysql-test/r/ps.result:
  Fix for bug #32137: prepared statement crash with str_to_date in update clause
    - test result.
mysql-test/t/ps.test:
  Fix for bug #32137: prepared statement crash with str_to_date in update clause
    - test case.
sql/item_timefunc.cc:
  Fix for bug #32137: prepared statement crash with str_to_date in update clause
    - call argument's val_str() only for constant items in the 
      Item_func_str_to_date::fix_length_and_dec().

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


storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  SCCS merged

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

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


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

mysql-test/mysql-test-run.pl:
  Also check for euid == 0

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

ndb/src/mgmsrv/Services.cpp:
  Only call 'updateStatus'(and forcing HB) once before printing
  node status
ndb/src/ndbapi/ClusterMgr.cpp:
  Only wait for reply to forced API_REGREQ if any signals
  has been sent

 - Fix problem in first implementation


mysql-test/lib/mtr_cases.pl:
  Prepend a ^ to the regex only if _all_ charactersin the pattern are normal

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

into  loke.(none):/home/knielsen/devel/mysql-5.0-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