diff options
| author | monty@narttu.mysql.fi <> | 2003-03-17 19:06:14 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-03-17 19:06:14 +0200 |
| commit | 3ec97824b74d0826ef19d984b5b70792471f8986 (patch) | |
| tree | dd803720b52dc64632092f8df19c3e619048d4a3 | |
| parent | ba46c7289c3ce1517e595a37cef48ffb3c993bb0 (diff) | |
| download | mariadb-git-3ec97824b74d0826ef19d984b5b70792471f8986.tar.gz | |
Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/my_dbug.h (renamed from include/dbug.h) | 0 | ||||
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | libmysql/get_password.c | 1 | ||||
| -rw-r--r-- | libmysqld/lib_vio.c | 1 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
6 files changed, 3 insertions, 5 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index cb6da7bbb3a..83cf4290d3d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -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 \ diff --git a/include/dbug.h b/include/my_dbug.h index 5c88e2e42db..5c88e2e42db 100644 --- a/include/dbug.h +++ b/include/my_dbug.h diff --git a/include/my_global.h b/include/my_global.h index 49ca0e03f89..39b6cada0e3 100644 --- a/include/my_global.h +++ b/include/my_global.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 */ diff --git a/libmysql/get_password.c b/libmysql/get_password.c index 53eeb1080ce..e6221ea556e 100644 --- a/libmysql/get_password.c +++ b/libmysql/get_password.c @@ -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 diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c index 821923fe667..448c11f9abd 100644 --- a/libmysqld/lib_vio.c +++ b/libmysqld/lib_vio.c @@ -33,7 +33,6 @@ #include <my_sys.h> #include <my_net.h> #include <m_string.h> -#include <dbug.h> #include <assert.h> #ifndef __WIN__ diff --git a/sql/table.cc b/sql/table.cc index d1e2c86e5ab..a26ab89bd97 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -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++; } |