← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-06-08 02:42:24 UTC
  • mfrom: (1054.1.6 merge)
  • Revision ID: brian@gaz-20090608024224-zlff1bpq62r8m5gy
Removal of LOCK TABLES.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
697
697
      old locks. This should always succeed (unless some external process
698
698
      has removed the tables)
699
699
    */
700
 
    session->in_lock_tables= true;
701
700
    result= session->reopen_tables(true, true);
702
 
    session->in_lock_tables= false;
703
701
 
704
702
    /* Set version for table */
705
703
    for (Table *table=session->open_tables; table ; table= table->next)
1978
1976
  table_list.table=      table;
1979
1977
 
1980
1978
  if (wait_for_locked_table_names(session, &table_list))
1981
 
    return 1;                             // Thread was killed
 
1979
    return true;                             // Thread was killed
1982
1980
 
1983
1981
  if (open_unireg_entry(session, &tmp, &table_list,
1984
1982
                        table->alias,
2020
2018
    for (part=0 ; part < table->key_info[key].usable_key_parts ; part++)
2021
2019
      table->key_info[key].key_part[part].field->table= table;
2022
2020
  }
2023
 
  /*
2024
 
    Do not attach MERGE children here. The children might be reopened
2025
 
    after the parent. Attach children after reopening all tables that
2026
 
    require reopen. See for example reopen_tables().
2027
 
  */
2028
2021
 
2029
2022
  broadcast_refresh();
2030
 
  error=0;
 
2023
  error= false;
2031
2024
 
2032
2025
end:
2033
2026
  return(error);