After merge fixes

1 files changed, 0 insertions, 11 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 28506284cac..5b9aaf9082e 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1937,17 +1937,6 @@ inline int hexchar_to_int(char c)
 }
 
 /*
-  is_user_table()
-  return true if the table was created explicitly
-*/
-
-inline bool is_user_table(TABLE * table)
-{
-  const char *name= table->s->table_name;
-  return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
-}
-
-/*
   Some functions that are different in the embedded library and the normal
   server
 */