bzr push into mysql-trunk branch (alexander.barkov:3364 to 3365) WL#946

[Alexander Barkov]

 3365 Alexander Barkov	2011-05-13
      WL#946 Fixing --ps test failures

    modified:
      libmysql/libmysql.c
 3364 Alexander Barkov	2011-05-13
      WL#946

    added:
      mysql-test/r/a.result
      mysql-test/t/a.test
    modified:
      client/mysqlbinlog.cc
      include/decimal.h
      include/my_global.h
      include/my_time.h
      libmysql/libmysql.c
      mysql-test/r/cast.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/date_formats.result
      mysql-test/r/deprecated_features.result
      mysql-test/r/func_sapdb.result
      mysql-test/r/func_time.result
      mysql-test/r/parser.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_innodb.result
      mysql-test/r/ps_2myisam.result
      mysql-test/r/ps_3innodb.result
      mysql-test/r/ps_4heap.result
      mysql-test/r/ps_5merge.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/strict.result
      mysql-test/r/sysdate_is_now.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_time.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/view.result
      mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/memory_func_view.result
      mysql-test/suite/funcs_1/r/myisam_func_view.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/innodb/r/innodb_bug52745.result
      mysql-test/t/cast.test
      mysql-test/t/deprecated_features.test
      mysql-test/t/func_time.test
      mysql-test/t/partition_innodb.test
      mysql-test/t/strict.test
      mysql-test/t/type_time.test
      sql-common/my_time.c
      sql/event_data_objects.cc
      sql/event_db_repository.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/protocol.cc
      sql/protocol.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_const.h
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_insert.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_show.cc
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      storage/innobase/handler/ha_innodb.cc
      strings/decimal.c
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2011-05-12 20:55:23 +0000
+++ b/libmysql/libmysql.c	2011-05-12 22:33:11 +0000
@@ -3469,7 +3469,7 @@ static void fetch_datetime_with_conversi
       fetch_string_with_conversion:
     */
     char buff[MAX_DATE_STRING_REP_LENGTH];
-    uint length= my_TIME_to_str(my_time, buff, 0); // TODO?
+    uint length= my_TIME_to_str(my_time, buff, field->decimals);
     /* Resort to string conversion */
     fetch_string_with_conversion(param, (char *)buff, length);
     break;
@@ -3946,7 +3946,7 @@ static my_bool setup_one_fetch_function(
     field->max_length= MAX_DOUBLE_STRING_REP_LENGTH;
     break;
   case MYSQL_TYPE_TIME:
-    field->max_length= 15;                    /* 19:23:48.123456 */
+    field->max_length= 17;                    /* -819:23:48.123456 */
     param->skip_result= skip_result_with_length;
     break;
   case MYSQL_TYPE_DATE:

No bundle (reason: useless for push emails).