List:Commits« Previous MessageNext Message »
From:kpettersson Date:October 11 2006 10:41am
Subject:bk commit into 5.0 tree (Kristofer.Pettersson:1.2279)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of Kristofer Pettersson. When Kristofer Pettersson does a push these
changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-11 10:41:22+02:00, Kristofer.Pettersson@naruto. +2 -0
  Merge naruto.:C:/cpp/bug21811/my50-bug21811
  into  naruto.:C:/cpp/mysql-5.0-maint
  MERGE: 1.2258.55.1

  mysql-test/r/func_time.result@stripped, 2006-10-11 10:41:18+02:00,
Kristofer.Pettersson@naruto. +0 -0
    Auto merged
    MERGE: 1.67.2.1

  sql/item_timefunc.cc@stripped, 2006-10-11 10:41:18+02:00, Kristofer.Pettersson@naruto. +0
-0
    Auto merged
    MERGE: 1.124.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Kristofer.Pettersson
# Host:	naruto.
# Root:	C:/cpp/mysql-5.0-maint/RESYNC

--- 1.126/sql/item_timefunc.cc	2006-10-11 10:41:41 +02:00
+++ 1.127/sql/item_timefunc.cc	2006-10-11 10:41:41 +02:00
@@ -2151,11 +2151,15 @@
           (date_sub_interval == other->date_sub_interval));
 }
 
+/*
+   'interval_names' reflects the order of the enumeration interval_type.
+   See item_timefunc.h
+ */
 
 static const char *interval_names[]=
 {
-  "year", "quarter", "month", "day", "hour",
-  "minute", "week", "second", "microsecond",
+  "year", "quarter", "month", "week", "day",  
+  "hour", "minute", "second", "microsecond",
   "year_month", "day_hour", "day_minute", 
   "day_second", "hour_minute", "hour_second",
   "minute_second", "day_microsecond",

--- 1.70/mysql-test/r/func_time.result	2006-10-11 10:41:41 +02:00
+++ 1.71/mysql-test/r/func_time.result	2006-10-11 10:41:41 +02:00
@@ -612,7 +612,7 @@
 2003-01-03 01:01:01
 select date_add(date,INTERVAL "1" WEEK) from t1;
 date_add(date,INTERVAL "1" WEEK)
-2003-01-09 00:00:00
+2003-01-09
 select date_add(date,INTERVAL "1" QUARTER) from t1;
 date_add(date,INTERVAL "1" QUARTER)
 2003-04-02
@@ -621,7 +621,7 @@
 2003-01-02 00:01:00
 select timestampadd(WEEK, 1, date) from t1;
 timestampadd(WEEK, 1, date)
-2003-01-09 00:00:00
+2003-01-09
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
 timestampadd(SQL_TSI_SECOND, 1, date)
 2003-01-02 00:00:01
Thread
• bk commit into 5.0 tree (Kristofer.Pettersson:1.2279)kpettersson11 Oct