Merge with 5.1-microseconds

A lot of small fixes and new test cases.

client/mysqlbinlog.cc:
  Cast removed
client/mysqltest.cc:
  Added missing DBUG_RETURN
include/my_pthread.h:
  set_timespec_time_nsec() now only takes one argument
mysql-test/t/date_formats.test:
  Remove --disable_ps_protocl as now also ps supports microseconds
mysys/my_uuid.c:
  Changed to use my_interval_timer() instead of my_getsystime()
mysys/waiting_threads.c:
  Changed to use my_hrtime()
sql/field.h:
  Added bool special_const_compare() for fields that may convert values before compare (like year)
sql/field_conv.cc:
  Added test to get optimal copying of identical temporal values.
sql/item.cc:
  Return that item_int is equal if it's positive, even if unsigned flag is different.
  Fixed Item_cache_str::save_in_field() to have identical null check as other similar functions
  Added proper NULL check to Item_cache_int::save_in_field()
sql/item_cmpfunc.cc:
  Don't call convert_constant_item() if there is nothing that is worth converting.
  Simplified test when years should be converted
sql/item_sum.cc:
  Mark cache values in Item_sum_hybrid as not constants to ensure they are not replaced by other cache values in compare_datetime()
sql/item_timefunc.cc:
  Changed sec_to_time() to take a my_decimal argument to ensure we don't loose any sub seconds.
  Added Item_temporal_func::get_time() (This simplifies some things)
sql/mysql_priv.h:
  Added Lazy_string_decimal()
sql/mysqld.cc:
  Added my_decimal constants max_seconds_for_time_type, time_second_part_factor
sql/table.cc:
  Changed expr_arena to be of type CONVENTIONAL_EXECUTION to ensure that we don't loose any items that are created by fix_fields()
sql/tztime.cc:
  TIME_to_gmt_sec() now sets *in_dst_time_gap in case of errors
  This is needed to be able to detect if timestamp is 0
storage/maria/lockman.c:
  Changed from my_getsystime() to set_timespec_time_nsec()
storage/maria/ma_loghandler.c:
  Changed from my_getsystime() to my_hrtime()
storage/maria/ma_recovery.c:
  Changed from my_getsystime() to mmicrosecond_interval_timer()
storage/maria/unittest/trnman-t.c:
  Changed from my_getsystime() to mmicrosecond_interval_timer()
storage/xtradb/handler/ha_innodb.cc:
  Added support for new time,datetime and timestamp
unittest/mysys/thr_template.c:
  my_getsystime() -> my_interval_timer()
unittest/mysys/waiting_threads-t.c:
  my_getsystime() -> my_interval_timer()

1 files changed, 14 insertions, 6 deletions

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index e7e77fb58b6..69eea97bd09 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3944,8 +3944,14 @@ String *Item_dyncol_get::val_str(String *str_result)
   case DYN_COL_TIME:
   {
     int length;
+    /*
+      We use AUTO_SEC_PART_DIGITS here to ensure that we do not loose
+      any microseconds from the data. This is safe to do as we are
+      asked to return the time argument as a string.
+    */
     if (str_result->alloc(MAX_DATE_STRING_REP_LENGTH) ||
-        !(length= my_TIME_to_str(&val.time_value, (char*) str_result->ptr())))
+        !(length= my_TIME_to_str(&val.time_value, (char*) str_result->ptr(),
+                                 AUTO_SEC_PART_DIGITS)))
       goto null;
     str_result->set_charset(&my_charset_latin1);
     str_result->length(length);
@@ -4086,7 +4092,7 @@ double Item_dyncol_get::val_real()
   case DYN_COL_DATE:
   case DYN_COL_TIME:
     return (ulonglong2double(TIME_to_ulonglong(&val.time_value)) +
-            val.time_value.second_part / (double) TIME_SUBSECOND_RANGE);
+            val.time_value.second_part / (double) TIME_SECOND_PART_FACTOR);
   }
 
 null:
@@ -4145,10 +4151,12 @@ my_decimal *Item_dyncol_get::val_decimal(my_decimal *decimal_value)
   case DYN_COL_DATE:
   case DYN_COL_TIME:
   {
-    double tmp= (ulonglong2double(TIME_to_ulonglong(&val.time_value)) +
-                 val.time_value.second_part / (double) TIME_SUBSECOND_RANGE);
-    /* This can't overflow as time is always in the range of decimal */
-    double2my_decimal(E_DEC_FATAL_ERROR, tmp, decimal_value);
+    my_decimal time_part, sub_second, fractions;
+    longlong2decimal(TIME_to_ulonglong(&val.time_value), &time_part);
+    longlong2decimal(val.time_value.second_part, &sub_second);
+    my_decimal_div(E_DEC_FATAL_ERROR, &fractions, &sub_second,
+                   &time_second_part_factor, TIME_SECOND_PART_DIGITS);
+    my_decimal_add(E_DEC_FATAL_ERROR, decimal_value, &time_part, &fractions);
     break;
   }
   }