← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2009-05-13 02:07:22 UTC
  • mfrom: (1008.1.5 merge)
  • Revision ID: brian@gaz-20090513020722-9nqehweityhn6ab0
Merge in refactoring around lock system

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
11313
11313
  {
11314
11314
    if (!table->key_read && table->covering_keys.test(tab->ref.key) &&
11315
11315
        !table->no_keyread &&
11316
 
        (int) table->reginfo.lock_type <= (int) TL_READ_HIGH_PRIORITY)
 
11316
        (int) table->reginfo.lock_type <= (int) TL_READ_WITH_SHARED_LOCKS)
11317
11317
    {
11318
11318
      table->key_read=1;
11319
11319
      table->file->extra(HA_EXTRA_KEYREAD);
16383
16383
  /* First add options */
16384
16384
  if (options & SELECT_STRAIGHT_JOIN)
16385
16385
    str->append(STRING_WITH_LEN("straight_join "));
16386
 
  if ((session->lex->lock_option == TL_READ_HIGH_PRIORITY) &&
16387
 
      (this == &session->lex->select_lex))
16388
 
    str->append(STRING_WITH_LEN("high_priority "));
16389
16386
  if (options & SELECT_DISTINCT)
16390
16387
    str->append(STRING_WITH_LEN("distinct "));
16391
16388
  if (options & SELECT_SMALL_RESULT)