Merge lp:~brianaker/drizzle/now-fix into lp:drizzle/7.0

[Brian Aker]

=== modified file 'drizzled/field/microtime.cc'
--- drizzled/field/microtime.cc	2011-01-06 23:02:43 +0000
+++ drizzled/field/microtime.cc	2011-01-11 01:56:36 +0000
@@ -90,6 +90,21 @@
   return 0;
 }
 
+int Microtime::store_time(type::Time *ltime, enum enum_drizzle_timestamp_type )
+{
+  long my_timezone;
+  bool in_dst_time_gap;
+
+  time_t time_tmp= my_system_gmt_sec(ltime, &my_timezone, &in_dst_time_gap, true);
+  uint64_t tmp_seconds= time_tmp;
+  uint32_t tmp_micro= ltime->second_part;
+
+  pack_num(tmp_seconds);
+  pack_num(tmp_micro, ptr +8);
+
+  return 0;
+}
+
 int Microtime::store(double from)
 {
   ASSERT_COLUMN_MARKED_FOR_WRITE;

=== modified file 'drizzled/field/microtime.h'
--- drizzled/field/microtime.h	2011-01-06 18:00:47 +0000
+++ drizzled/field/microtime.h	2011-01-11 01:56:36 +0000
@@ -50,10 +50,12 @@
   enum_field_types type() const { return DRIZZLE_TYPE_MICROTIME;}
   enum ha_base_keytype key_type() const { return HA_KEYTYPE_BINARY; }
   enum Item_result cmp_type () const { return STRING_RESULT; }
-  int  store(const char *to,uint32_t length,
-             const CHARSET_INFO * const charset);
-  int  store(double nr);
-  int  store(int64_t nr, bool unsigned_val);
+  int store(const char *to,uint32_t length,
+            const CHARSET_INFO * const charset);
+  int store(double nr);
+  int store(int64_t nr, bool unsigned_val);
+  int store_time(type::Time *ltime, enum enum_drizzle_timestamp_type t_type);
+
   double val_real(void);
   int64_t val_int(void);
   String *val_str(String*,String *);

=== modified file 'drizzled/sql_base.cc'
--- drizzled/sql_base.cc	2011-01-08 11:27:50 +0000
+++ drizzled/sql_base.cc	2011-01-11 01:56:36 +0000
@@ -3887,12 +3887,15 @@
     table= (*ptr)->getTable();
     table->auto_increment_field_not_null= false;
   }
+
   while ((field = *ptr++) && ! session->is_error())
   {
     value=v++;
     table= field->getTable();
+
     if (field == table->next_number_field)
       table->auto_increment_field_not_null= true;
+
     if (value->save_in_field(field, 0) < 0)
     {
       if (table)

=== modified file 'drizzled/type/time.cc'
--- drizzled/type/time.cc	2010-12-26 00:07:57 +0000
+++ drizzled/type/time.cc	2011-01-11 01:56:36 +0000
@@ -814,7 +814,7 @@
 */
 time_t
 my_system_gmt_sec(const type::Time *t_src, long *my_timezone,
-                  bool *in_dst_time_gap)
+                  bool *in_dst_time_gap, bool skip_timezone)
 {
   uint32_t loop;
   time_t tmp= 0;
@@ -929,7 +929,15 @@
                  3600);
 
   current_timezone= my_time_zone;
-  localtime_r(&tmp,&tm_tmp);
+  if (skip_timezone)
+  {
+    gmtime_r(&tmp, &tm_tmp);
+  }
+  else
+  {
+    localtime_r(&tmp,&tm_tmp);
+  }
+
   l_time=&tm_tmp;
   for (loop=0;
        loop < 2 &&
@@ -949,7 +957,14 @@
           (long) ((int) t->second - (int) l_time->tm_sec));
     current_timezone+= diff+3600;		/* Compensate for -3600 above */
     tmp+= (time_t) diff;
-    localtime_r(&tmp,&tm_tmp);
+    if (skip_timezone)
+    {
+      gmtime_r(&tmp, &tm_tmp);
+    }
+    else
+    {
+      localtime_r(&tmp, &tm_tmp);
+    }
     l_time=&tm_tmp;
   }
   /*

=== modified file 'drizzled/type/time.h'
--- drizzled/type/time.h	2011-01-06 23:02:43 +0000
+++ drizzled/type/time.h	2011-01-11 01:56:36 +0000
@@ -145,7 +145,7 @@
 
 time_t
 my_system_gmt_sec(const type::Time *t, long *my_timezone,
-                  bool *in_dst_time_gap);
+                  bool *in_dst_time_gap, bool skip_timezone= false);
 
 void set_zero_time(type::Time *tm, enum enum_drizzle_timestamp_type time_type);