← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-06-05 05:40:36 UTC
  • mfrom: (1046.1.15 merge)
  • Revision ID: brian@gaz-20090605054036-1024tm3gv0oloipw
Merge of Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1204
1204
    /* we must end the trasaction first, regardless of anything */
1205
1205
    if (! session->endActiveTransaction())
1206
1206
      goto error;
1207
 
    session->in_lock_tables=1;
 
1207
    session->in_lock_tables= true;
1208
1208
    session->options|= OPTION_TABLE_LOCK;
1209
1209
 
1210
1210
    if (!(res= simple_open_n_lock_tables(session, all_tables)))
1225
1225
      (void) session->endActiveTransaction();
1226
1226
      session->options&= ~(OPTION_TABLE_LOCK);
1227
1227
    }
1228
 
    session->in_lock_tables=0;
 
1228
    session->in_lock_tables= false;
1229
1229
    break;
1230
1230
  case SQLCOM_CREATE_DB:
1231
1231
  {
2521
2521
      }
2522
2522
      if (lock_global_read_lock(session))
2523
2523
        return 1;                               // Killed
2524
 
      result= close_cached_tables(session, tables, false, (options & REFRESH_FAST) ?
 
2524
      result= close_cached_tables(session, tables, (options & REFRESH_FAST) ?
2525
2525
                                  false : true, true);
2526
2526
      if (make_global_read_lock_block_commit(session)) // Killed
2527
2527
      {
2531
2531
      }
2532
2532
    }
2533
2533
    else
2534
 
      result= close_cached_tables(session, tables, false, (options & REFRESH_FAST) ?
 
2534
      result= close_cached_tables(session, tables, (options & REFRESH_FAST) ?
2535
2535
                                  false : true, false);
2536
2536
  }
2537
2537
  if (session && (options & REFRESH_STATUS))