Commit 2ae7db32 authored by unknown's avatar unknown
Browse files

Fix wrong auto merge

parent 03094596

mysys/my_access.c

+0 −8
Original line number Diff line number Diff line
@@ -155,14 +155,6 @@ int check_if_legal_tablename(const char *name) 
              str_list_find(&reserved_names[1], name));

}



#else



int check_if_legal_tablename(const char *name)

{

  return 0;

}



#endif /* defined(MSDOS) || defined(__WIN__) */



#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)