← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2008-10-02 01:31:53 UTC
  • mfrom: (398.1.6 codestyle-new)
  • Revision ID: monty@inaugust.com-20081002013153-b097om921cd3j1pn
Merged from stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
341
341
  thr_lock_type lock_type;
342
342
  struct st_table_lock_info table_lock_info;
343
343
  interval_type interval, interval_time_st;
344
 
  timestamp_type date_time_type;
 
344
  enum enum_drizzle_timestamp_type date_time_type;
345
345
  st_select_lex *select_lex;
346
346
  chooser_compare_func_creator boolfunc2creator;
347
347
  struct sp_cond_type *spcondtype;
1233
1233
               from 0" (4 in fact), unspecified means "don't change the position
1234
1234
               (keep the preceding value)").
1235
1235
            */
1236
 
            Lex->mi.pos = max((uint64_t)BIN_LOG_HEADER_SIZE, Lex->mi.pos);
 
1236
            Lex->mi.pos = cmax((uint64_t)BIN_LOG_HEADER_SIZE, Lex->mi.pos);
1237
1237
          }
1238
1238
        | RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys
1239
1239
          {
1243
1243
          {
1244
1244
            Lex->mi.relay_log_pos = $3;
1245
1245
            /* Adjust if < BIN_LOG_HEADER_SIZE (same comment as Lex->mi.pos) */
1246
 
            Lex->mi.relay_log_pos = max((uint32_t)BIN_LOG_HEADER_SIZE, Lex->mi.relay_log_pos);
 
1246
            Lex->mi.relay_log_pos = cmax((uint32_t)BIN_LOG_HEADER_SIZE, Lex->mi.relay_log_pos);
1247
1247
          }
1248
1248
        ;
1249
1249