← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1760
1760
  if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
1761
1761
  {
1762
1762
    /* Open table and put in temporary table list */
1763
 
    if (!(session->open_temporary_table(path, db, table_name, 1, OTM_OPEN)))
 
1763
    if (!(session->open_temporary_table(path, db, table_name, 1)))
1764
1764
    {
1765
1765
      (void) session->rm_temporary_table(create_info->db_type, path);
1766
1766
      goto unlock_and_end;
2511
2511
 
2512
2512
  if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
2513
2513
  {
2514
 
    if (err || !session->open_temporary_table(dst_path, db, table_name, 1, OTM_OPEN))
 
2514
    if (err || !session->open_temporary_table(dst_path, db, table_name, true))
2515
2515
    {
2516
2516
      (void) session->rm_temporary_table(create_info->db_type, dst_path);
2517
2517
      goto err;