← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal_interval.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal_interval.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
#include "drizzled/internal/m_string.h"
22
 
#include "drizzled/error.h"
23
 
#include "drizzled/session.h"
24
 
#include "config.h"
25
 
#include "drizzled/function/time/date.h"
26
 
#include "drizzled/temporal_interval.h"
27
 
#include "drizzled/time_functions.h"
 
20
#include <config.h>
 
21
 
 
22
#include <drizzled/internal/m_string.h>
 
23
#include <drizzled/error.h>
 
24
#include <drizzled/session.h>
 
25
#include <drizzled/current_session.h>
 
26
#include <drizzled/function/time/date.h>
 
27
#include <drizzled/temporal_interval.h>
 
28
#include <drizzled/time_functions.h>
28
29
 
29
30
namespace drizzled
30
31
{
37
38
  int64_t value= 0;
38
39
  const char *str= NULL;
39
40
  size_t length= 0;
40
 
  const CHARSET_INFO * const cs= str_value->charset();
 
41
  const charset_info_st * const cs= str_value->charset();
41
42
 
42
43
 
43
44
  // Types <= microsecond can be converted as an integer
186
187
  return false;
187
188
}
188
189
 
189
 
bool TemporalInterval::addDate(DRIZZLE_TIME *ltime, interval_type int_type)
 
190
bool TemporalInterval::addDate(type::Time *ltime, interval_type int_type)
190
191
{
191
192
  long period, sign;
192
193
 
211
212
  case INTERVAL_DAY_MINUTE:
212
213
  case INTERVAL_DAY_HOUR:
213
214
    int64_t sec, days, daynr, microseconds, extra_sec;
214
 
    ltime->time_type= DRIZZLE_TIMESTAMP_DATETIME; // Return full date
 
215
    ltime->time_type= type::DRIZZLE_TIMESTAMP_DATETIME; // Return full date
215
216
    microseconds= ltime->second_part + sign*second_part;
216
217
    extra_sec= microseconds/1000000L;
217
218
    microseconds= microseconds%1000000L;
241
242
    /* Day number from year 0 to 9999-12-31 */
242
243
    if ((uint64_t) daynr > MAX_DAY_NUMBER)
243
244
      goto invalid_date;
244
 
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month,
245
 
        &ltime->day);
 
245
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month, &ltime->day);
246
246
    break;
247
247
  case INTERVAL_DAY:
248
248
  case INTERVAL_WEEK:
286
286
 
287
287
invalid_date:
288
288
  push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
289
 
      ER_DATETIME_FUNCTION_OVERFLOW,
290
 
      ER(ER_DATETIME_FUNCTION_OVERFLOW),
291
 
      "datetime");
 
289
                      ER_DATETIME_FUNCTION_OVERFLOW,
 
290
                      ER(ER_DATETIME_FUNCTION_OVERFLOW),
 
291
                      "datetime");
292
292
null_date:
293
293
  return 1;
294
294
}
295
295
 
296
296
bool TemporalInterval::getIntervalFromString(const char *str,
297
297
                                             uint32_t length,
298
 
                                             const CHARSET_INFO * const cs,
 
298
                                             const charset_info_st * const cs,
299
299
                                             uint32_t count, uint64_t *values,
300
300
                                             bool transform_msec)
301
301
{