discover of table non-existance on drop

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 00ed78f335d..d58040abaa8 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3448,9 +3448,14 @@ int handler::delete_table(const char *name)
 {
   int saved_error= 0;
   int error= 0;
-  int enoent_or_zero= ENOENT;                   // Error if no file was deleted
+  int enoent_or_zero;
   char buff[FN_REFLEN];
 
+  if (ht->discover_table)
+    enoent_or_zero= 0; // the table may not exist in the engine, it's ok
+  else
+    enoent_or_zero= ENOENT;  // the first file of bas_ext() *must* exist
+
   for (const char **ext=bas_ext(); *ext ; ext++)
   {
     fn_format(buff, name, "", *ext, MY_UNPACK_FILENAME|MY_APPEND_EXT);