mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
This commit is contained in:
@ -16,7 +16,7 @@
|
|||||||
# MA 02111-1307, USA
|
# MA 02111-1307, USA
|
||||||
|
|
||||||
BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
|
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 \
|
mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
|
||||||
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
|
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
|
||||||
errmsg.h my_global.h my_net.h my_alloc.h \
|
errmsg.h my_global.h my_net.h my_alloc.h \
|
||||||
|
@ -392,7 +392,7 @@ typedef unsigned short ushort;
|
|||||||
#define DBUG_OFF
|
#define DBUG_OFF
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <dbug.h>
|
#include <my_dbug.h>
|
||||||
|
|
||||||
#define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/
|
#define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/
|
||||||
#define ASCII_BITS_USED 8 /* Bit char used */
|
#define ASCII_BITS_USED 8 /* Bit char used */
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
#include "mysql.h"
|
#include "mysql.h"
|
||||||
#include <m_string.h>
|
#include <m_string.h>
|
||||||
#include <m_ctype.h>
|
#include <m_ctype.h>
|
||||||
#include <dbug.h>
|
|
||||||
|
|
||||||
#if defined(HAVE_BROKEN_GETPASS) && !defined(HAVE_GETPASSPHRASE)
|
#if defined(HAVE_BROKEN_GETPASS) && !defined(HAVE_GETPASSPHRASE)
|
||||||
#undef HAVE_GETPASS
|
#undef HAVE_GETPASS
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
#include <my_net.h>
|
#include <my_net.h>
|
||||||
#include <m_string.h>
|
#include <m_string.h>
|
||||||
#include <dbug.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#ifndef __WIN__
|
#ifndef __WIN__
|
||||||
|
@ -1180,7 +1180,7 @@ bool check_table_name(const char *name, uint length)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (*name == '/' || *name == FN_LIBCHAR || *name == FN_EXTCHAR)
|
if (*name == '/' || *name == '\\' || *name == FN_EXTCHAR)
|
||||||
return 1;
|
return 1;
|
||||||
name++;
|
name++;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user