Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

sql/sql_table.cc:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged

2 files changed, 40 insertions, 31 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 652278e8a80..e197cee4cde 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -37,16 +37,25 @@ SUPERCLEANFILES =	mysql_version.h my_config.h
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h
 
+clean:
+	$(RM) -f readline/*
+distclean:
+	$(RM) -f readline/*
+
 all-local:		my_config.h
 
 # Since we include my_config.h it better exist from the beginning
 link_sources:
 	$(CP) ../config.h my_config.h
+	$(RM) -f readline/*
+	@readline_h_ln_cmd@
 
 # Keep automake happy 
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h
+	$(RM) -f readline/*
+	@readline_h_ln_cmd@
 
 # These files should not be included in distributions since they are
 # generated by configure from the .h.in files
diff --git a/include/typelib.h b/include/typelib.h
index 8de94aba553..2999de563ac 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -1,33 +1,33 @@
-/* Copyright (C) 2000 MySQL AB

-

-   This program is free software; you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or

-   (at your option) any later version.

-

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-

-   You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-

-

-#ifndef _typelib_h

-#define _typelib_h

-
-typedef struct st_typelib {	/* Different types saved here */

-  uint count;			/* How many types */

-  const char *name;		/* Name of typelib */

-  const char **type_names;

-} TYPELIB;

-
-extern int find_type(char *x,TYPELIB *typelib,uint full_name);

-extern void make_type(char *to,uint nr,TYPELIB *typelib);

-extern const char *get_type(TYPELIB *typelib,uint nr);

-
-extern TYPELIB sql_protocol_typelib;

+/* Copyright (C) 2000 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+
+#ifndef _typelib_h
+#define _typelib_h
+
+typedef struct st_typelib {	/* Different types saved here */
+  uint count;			/* How many types */
+  const char *name;		/* Name of typelib */
+  const char **type_names;
+} TYPELIB;
+
+extern int find_type(char *x,TYPELIB *typelib,uint full_name);
+extern void make_type(char *to,uint nr,TYPELIB *typelib);
+extern const char *get_type(TYPELIB *typelib,uint nr);
+
+extern TYPELIB sql_protocol_typelib;
 
 #endif /* _typelib_h */