~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_redel.cc

  • Committer: Lee Bieber
  • Date: 2011-01-12 02:31:03 UTC
  • mfrom: (2068.7.5 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2076.
  • Revision ID: kalebral@gmail.com-20110112023103-nmz26cv1j32jc6n3
Merge Brian - fix bug 527084 - DROP TABLE: getTableDefiniton returns EEXIST but doDropTable returns ENOENT leads to SIGSEGV

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
                  MyFlags))
66
66
      goto end;
67
67
  }
68
 
  else if (my_delete(org_name, MyFlags))
 
68
  else if (my_delete_allow_opened(org_name, MyFlags))
69
69
      goto end;
70
70
  if (my_rename(tmp_name,org_name,MyFlags))
71
71
    goto end;