mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into narttu.mysql.fi:/my/mysql-4.0
This commit is contained in:
unknown 2003-03-17 19:07:08 +02:00
commit 2103479670
6 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Makefile.am
View file

@ -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 \

0
include/dbug.h → include/my_dbug.h
View file

2
include/my_global.h
View file

@ -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 */

1
libmysql/get_password.c
View file

@ -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

1
libmysqld/lib_vio.c
View file

@ -33,7 +33,6 @@
#include <my_sys.h>
#include <my_net.h>
#include <m_string.h>
#include <dbug.h>
#include <assert.h>
#ifndef __WIN__

2
sql/table.cc
View file

@ -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++;
}