← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-05-14 20:07:56 UTC
  • Revision ID: brian@gaz-20090514200756-3n2gijegyd3o03qu
Remove the need for TMP_TABLE_KEY_EXTRA (we don't replicate temp tables).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2186
2186
    char key[MAX_DBKEY_LENGTH];
2187
2187
    uint32_t key_length;
2188
2188
 
2189
 
    key_length= create_table_def_key(session, key, table_list, 0);
 
2189
    key_length= create_table_def_key(key, table_list);
2190
2190
    pthread_mutex_lock(&LOCK_open);
2191
2191
    if (!(share= (get_table_share(session, table_list, key, key_length, 0,
2192
2192
                                  &error))))
4089
4089
    /* Remove link to old table and rename the new one */
4090
4090
    close_temporary_table(session, table, 1, 1);
4091
4091
    /* Should pass the 'new_name' as we store table name in the cache */
4092
 
    if (rename_temporary_table(session, new_table, new_db, new_name))
 
4092
    if (rename_temporary_table(new_table, new_db, new_name))
4093
4093
      goto err1;
4094
4094
    goto end_temporary;
4095
4095
  }