← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time.cc

  • Committer: Monty Taylor
  • Date: 2008-10-04 18:42:30 UTC
  • Revision ID: monty@inaugust.com-20081004184230-j2j1uottu2d0yl0m
Removed NullS. bu-bye.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time.cc
231
231
                           &was_cut);
232
232
  if (was_cut || ts_type <= DRIZZLE_TIMESTAMP_ERROR)
233
233
    make_truncated_value_warning(current_thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
234
 
                                 str, length, ts_type,  NullS);
 
234
                                 str, length, ts_type,  NULL);
235
235
  return ts_type;
236
236
}
237
237
 
285
285
  bool ret_val= str_to_time(str, length, l_time, &warning);
286
286
  if (ret_val || warning)
287
287
    make_truncated_value_warning(current_thd, DRIZZLE_ERROR::WARN_LEVEL_WARN,
288
 
                                 str, length, DRIZZLE_TIMESTAMP_TIME, NullS);
 
288
                                 str, length, DRIZZLE_TIMESTAMP_TIME, NULL);
289
289
  return ret_val;
290
290
}
291
291