← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

  • Committer: Monty Taylor
  • Date: 2008-09-23 01:53:40 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: monty@inaugust.com-20080923015340-z8p6sbl7y27c4k30
Enabled -Wlong-long.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
1519
1519
  {
1520
1520
    if (value->val_int(value, (int64_t *)&result))
1521
1521
      goto err;
1522
 
    if (unlikely((result >= (1ULL << typelib->count)) &&
 
1522
    if (unlikely((result >= (1UL << typelib->count)) &&
1523
1523
                 (typelib->count < sizeof(long)*8)))
1524
1524
    {
1525
1525
      llstr(result, buff);
2277
2277
    options->typelib= ((sysvar_set_t*) opt)->typelib;
2278
2278
    options->def_value= ((sysvar_set_t*) opt)->def_val;
2279
2279
    options->min_value= options->block_size= 0;
2280
 
    options->max_value= (1ULL << options->typelib->count) - 1;
 
2280
    options->max_value= (1UL << options->typelib->count) - 1;
2281
2281
    break;
2282
2282
  case PLUGIN_VAR_BOOL:
2283
2283
    options->var_type= GET_BOOL;
2319
2319
    options->typelib= ((thdvar_set_t*) opt)->typelib;
2320
2320
    options->def_value= ((thdvar_set_t*) opt)->def_val;
2321
2321
    options->min_value= options->block_size= 0;
2322
 
    options->max_value= (1ULL << options->typelib->count) - 1;
 
2322
    options->max_value= (1UL << options->typelib->count) - 1;
2323
2323
    break;
2324
2324
  case PLUGIN_VAR_BOOL | PLUGIN_VAR_THDLOCAL:
2325
2325
    options->var_type= GET_BOOL;