← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2008-08-10 17:18:41 UTC
  • mfrom: (287.3.13 codestyle)
  • Revision ID: brian@tangent.org-20080810171841-pkvi2ky94wbd0nt5
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1244
1244
               from 0" (4 in fact), unspecified means "don't change the position
1245
1245
               (keep the preceding value)").
1246
1246
            */
1247
 
            Lex->mi.pos = max(BIN_LOG_HEADER_SIZE, Lex->mi.pos);
 
1247
            Lex->mi.pos = max((uint64_t)BIN_LOG_HEADER_SIZE, Lex->mi.pos);
1248
1248
          }
1249
1249
        | RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys
1250
1250
          {
1254
1254
          {
1255
1255
            Lex->mi.relay_log_pos = $3;
1256
1256
            /* Adjust if < BIN_LOG_HEADER_SIZE (same comment as Lex->mi.pos) */
1257
 
            Lex->mi.relay_log_pos = max(BIN_LOG_HEADER_SIZE, Lex->mi.relay_log_pos);
 
1257
            Lex->mi.relay_log_pos = max((uint32_t)BIN_LOG_HEADER_SIZE, Lex->mi.relay_log_pos);
1258
1258
          }
1259
1259
        ;
1260
1260