← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Stewart Smith
  • Date: 2009-07-27 03:26:44 UTC
  • mto: (1093.1.29 captain)
  • mto: This revision was merged to the branch mainline in revision 1102.
  • Revision ID: stewart@flamingspork.com-20090727032644-zm1i88p1p1y8ja1v
misc codestyle fixes. usually around if ( and associated conditions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
2203
2203
  var->save_result.storage_engine= NULL;
2204
2204
  if (var->value->result_type() == STRING_RESULT)
2205
2205
  {
2206
 
    if (!(res= var->value->val_str(&str)) || !(res->ptr()))
 
2206
    res= var->value->val_str(&str);
 
2207
    if (res == NULL || res->ptr() == NULL)
2207
2208
    {
2208
2209
      value= "NULL";
2209
2210
      goto err;
2212
2213
    {
2213
2214
      const std::string engine_name(res->ptr());
2214
2215
      StorageEngine *engine;
2215
 
      if (!(var->save_result.storage_engine=
2216
 
            ha_resolve_by_name(session, engine_name)) ||
2217
 
          !(engine= var->save_result.storage_engine))
 
2216
      var->save_result.storage_engine= ha_resolve_by_name(session, engine_name);
 
2217
      if (var->save_result.storage_engine == NULL)
2218
2218
      {
2219
2219
        value= res->c_ptr();
2220
2220
        goto err;
2221
2221
      }
 
2222
      engine= var->save_result.storage_engine;
2222
2223
    }
2223
2224
    return 0;
2224
2225
  }