Commit 18a2030d authored by unknown's avatar unknown

Change dbug.h -> my_dbug.h (Portability fix)

Ensure that \ is not allowed in filenames, even on Unix


include/my_dbug.h:
  Rename: include/dbug.h -> include/my_dbug.h
include/Makefile.am:
  Change dbug.h -> my_dbug.h
include/my_global.h:
  Change dbug.h -> my_dbug.h
libmysql/get_password.c:
  Change dbug.h -> my_dbug.h
libmysqld/lib_vio.c:
  Change dbug.h -> my_dbug.h
sql/table.cc:
  Ensure that \ is not allowed in filenames, even on Unix
parent 26e849be
......@@ -16,7 +16,7 @@
# MA 02111-1307, USA
BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \
pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h \
mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
errmsg.h my_global.h my_net.h my_alloc.h \
......
......@@ -392,7 +392,7 @@ typedef unsigned short ushort;
#define DBUG_OFF
#endif
#include <dbug.h>
#include <my_dbug.h>
#define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/
#define ASCII_BITS_USED 8 /* Bit char used */
......
......@@ -23,7 +23,6 @@
#include "mysql.h"
#include <m_string.h>
#include <m_ctype.h>
#include <dbug.h>
#if defined(HAVE_BROKEN_GETPASS) && !defined(HAVE_GETPASSPHRASE)
#undef HAVE_GETPASS
......
......@@ -33,7 +33,6 @@
#include <my_sys.h>
#include <my_net.h>
#include <m_string.h>
#include <dbug.h>
#include <assert.h>
#ifndef __WIN__
......
......@@ -1180,7 +1180,7 @@ bool check_table_name(const char *name, uint length)
}
}
#endif
if (*name == '/' || *name == FN_LIBCHAR || *name == FN_EXTCHAR)
if (*name == '/' || *name == '\\' || *name == FN_EXTCHAR)
return 1;
name++;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment