← 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-11-18 06:11:12 UTC
  • mfrom: (1220.1.10 staging)
  • Revision ID: brian@gaz-20091118061112-tyf4qrfr5v7i946b
Monty + Brian Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
715
715
    return -1;
716
716
  }
717
717
 
718
 
  close_temporary_table(table, true, true);
 
718
  close_temporary_table(table);
719
719
 
720
720
  return 0;
721
721
}
809
809
                              const char *table_name)
810
810
{
811
811
  if (table->s->tmp_table)
812
 
    close_temporary_table(table, true, true);
 
812
    close_temporary_table(table);
813
813
  else
814
814
  {
815
815
    pthread_mutex_lock(&LOCK_open); /* Close and drop a table (AUX routine) */
1094
1094
 
1095
1095
Table *Session::openTable(TableList *table_list, bool *refresh, uint32_t flags)
1096
1096
{
1097
 
  register Table *table;
 
1097
  Table *table;
1098
1098
  char key[MAX_DBKEY_LENGTH];
1099
1099
  unsigned int key_length;
1100
1100
  const char *alias= table_list->alias;
2362
2362
  path_length= strlen(path);
2363
2363
 
2364
2364
  if (!(new_tmp_table= (Table*) malloc(sizeof(*new_tmp_table) + sizeof(*share) +
2365
 
                                   path_length + 1 + key_length)))
 
2365
                                       path_length + 1 + key_length)))
2366
2366
    return NULL;
2367
2367
 
2368
2368
  share= (TableShare*) (new_tmp_table+1);