← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal_interval.cc

Merge Monty - Added inter-plugin dependencies for controlling plugin load order

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
 
 
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>
 
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"
29
28
 
30
29
namespace drizzled
31
30
{
38
37
  int64_t value= 0;
39
38
  const char *str= NULL;
40
39
  size_t length= 0;
41
 
  const charset_info_st * const cs= str_value->charset();
 
40
  const CHARSET_INFO * const cs= str_value->charset();
42
41
 
43
42
 
44
43
  // Types <= microsecond can be converted as an integer
286
285
 
287
286
invalid_date:
288
287
  push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
289
 
                      ER_DATETIME_FUNCTION_OVERFLOW,
290
 
                      ER(ER_DATETIME_FUNCTION_OVERFLOW),
291
 
                      "datetime");
 
288
      ER_DATETIME_FUNCTION_OVERFLOW,
 
289
      ER(ER_DATETIME_FUNCTION_OVERFLOW),
 
290
      "datetime");
292
291
null_date:
293
292
  return 1;
294
293
}
295
294
 
296
295
bool TemporalInterval::getIntervalFromString(const char *str,
297
296
                                             uint32_t length,
298
 
                                             const charset_info_st * const cs,
 
297
                                             const CHARSET_INFO * const cs,
299
298
                                             uint32_t count, uint64_t *values,
300
299
                                             bool transform_msec)
301
300
{