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

into narttu.mysql.fi:/my/mysql-4.0

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 \

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

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

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__

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