Changed to use my_global.h

Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
2025-04-01 04:45:37 +02:00 · 2001-09-14 02:54:33 +03:00 · 2001-09-14 02:54:33 +03:00 · 16115af97c
commit 16115af97c
parent f996309528
143 changed files with 261 additions and 179 deletions
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@ -9958,6 +9958,13 @@ CC=fcc CFLAGS="-O -K fast -K lib -K omitfp -Kpreex -D_GNU_SOURCE -DCONST=const -

 MySQL needs at least Linux Version 2.0.

+@strong{WARNING}:
+We have have reports from some MySQL users that they have got serious
+stability problems with MySQL with Linux kernel 2.2.14.  If you are
+using this kernel you should upgrade to 2.2.19 (or newer) or to a 2.4
+kernel.  If you have a multi-cpu box, then you should seriously consider
+using 2.4 as this will give you a significant speed boost.
+
 The binary release is linked with @code{-static}, which means you do not
 normally need to worry about which version of the system libraries you
 have. You need not install LinuxThreads, either.  A program linked with
@ -28091,6 +28098,9 @@ You can always store an exact integer value in a @code{BIGINT} column by
 storing it as a string, as there is in this case there will be no
 intermediate double representation.
@item
+In MySQL 4.0 you can use integers to store big unsigned values in a
+@code{BIGINT} string.
+@item
@samp{-}, @samp{+}, and @samp{*} will use @code{BIGINT} arithmetic when
 both arguments are @code{INTEGER} values!  This means that if you
 multiply two big integers (or results from functions that return
@ -29151,7 +29161,9 @@ certain circumstances:
@item
 If you insert an invalid value into an @code{ENUM} (that is, a string not
 present in the list of allowed values), the empty string is inserted
-instead as a special error value.
+instead as a special error value. This string can be distinguished from a
+'normal' empty string by the fact that this string has the numerical value
+0. More about this later.

@item
 If an @code{ENUM} is declared @code{NULL}, @code{NULL} is also a legal value
@ -46933,6 +46945,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

@itemize @bullet
@item
+Fixed handling of big unsigned bigint constants.
+@item
 New character set @code{latin_de} which provides correct German sorting.
@item
@code{TRUNCATE TABLE} and @code{DELETE FROM table_name} are now separate
--- a/client/client_priv.h
+++ b/client/client_priv.h
@ -16,7 +16,7 @@

 /* Common defines for all clients */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h> 
 #include <m_string.h>
 #include <mysql.h>
--- a/client/completion_hash.cc
+++ b/client/completion_hash.cc
@ -22,7 +22,7 @@
 * Small portability changes by Monty. Changed also to use my_malloc/my_free
 */

-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #undef SAFEMALLOC				// Speed things up
 #include <my_sys.h>
--- a/client/errmsg.c
+++ b/client/errmsg.c
@ -18,7 +18,7 @@
 /* Error messages for MySQL clients */
 /* error messages for the demon is in share/language/errmsg.sys */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include "errmsg.h"

--- a/client/get_password.c
+++ b/client/get_password.c
@ -19,7 +19,7 @@
 ** Ask for a password from tty
 ** This is an own file to avoid conflicts with curses
 */
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include "mysql.h"
 #include <m_string.h>
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@ -39,7 +39,7 @@

 #define DUMP_VERSION "8.16"

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@ -18,7 +18,7 @@

 #define SHOW_VERSION "8.3"

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql.h"
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@ -45,7 +45,7 @@

 #define MTEST_VERSION "1.10"

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <mysql.h>
--- a/client/password.c
+++ b/client/password.c
@ -35,7 +35,7 @@
  This saves a hashed number as a string in the password field.
 *****************************************************************************/

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql.h"
--- a/client/readline.cc
+++ b/client/readline.cc
@ -17,7 +17,7 @@

 /* readline for batch mode */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "my_readline.h"
--- a/client/sql_string.cc
+++ b/client/sql_string.cc
@ -21,7 +21,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
--- a/client/thimble.cc
+++ b/client/thimble.cc
@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "my_global.h"
+#include "my_my_global.h"

 static void spawn_stern_thread(pthread_t *t);
 static int act_goofy(void);
--- a/client/thread_test.c
+++ b/client/thread_test.c
@ -15,7 +15,7 @@
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
   MA 02111-1307, USA */

-#include <global.h>
+#include <my_global.h>

 #ifndef THREAD

--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@ -69,7 +69,7 @@
 #ifdef DBUG_OFF
 #undef DBUG_OFF
 #endif
-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include <errno.h>
 #if defined(MSDOS) || defined(__WIN__)
--- a/dbug/dbug_analyze.c
+++ b/dbug/dbug_analyze.c
@ -49,7 +49,7 @@
 *	if invoked with -v flag.
 */

-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>

 static char *my_name;
--- a/dbug/example1.c
+++ b/dbug/example1.c
@ -1,5 +1,5 @@

-#include <global.h>
+#include <my_global.h>

 main (argc, argv)
 int argc;
--- a/dbug/example2.c
+++ b/dbug/example2.c
@ -1,5 +1,5 @@

-#include <global.h>
+#include <my_global.h>

 int debug = 0;

--- a/dbug/example3.c
+++ b/dbug/example3.c
@ -1,5 +1,5 @@

-#include <global.h>
+#include <my_global.h>

 main (argc, argv)
 int argc;
--- a/dbug/factorial.c
+++ b/dbug/factorial.c
@ -2,7 +2,7 @@
 #undef DBUG_OFF
 #endif

-#include <global.h>
+#include <my_global.h>

 int factorial (
 register int value)
--- a/dbug/main.c
+++ b/dbug/main.c
@ -2,7 +2,7 @@
 #undef DBUG_OFF
 #endif

-#include <global.h>	/* This includes dbug.h */
+#include <my_global.h>	/* This includes dbug.h */

 int main (argc, argv)
 int argc;
--- a/dbug/sanity.c
+++ b/dbug/sanity.c
@ -1,6 +1,6 @@
 /* Declarate _sanity() if not declared in main program */

-#include <global.h>
+#include <my_global.h>

 extern int _sanity(const char *file,uint line);

--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@ -17,7 +17,7 @@

 /* Saves all errmesg in a header file, updated by me, in a compact file  */

-#include <global.h>
+#include <my_global.h>
 #include <m_ctype.h>
 #include <my_sys.h>
 #include <m_string.h>
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@ -22,7 +22,7 @@
 **  Written by Monty
 */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <getopt.h>

--- a/extra/perror.c
+++ b/extra/perror.c
@ -19,7 +19,7 @@

 #define PERROR_VERSION "2.6"

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <errno.h>
--- a/extra/replace.c
+++ b/extra/replace.c
@ -38,7 +38,7 @@
 */

 #define DONT_USE_RAID
-#include <global.h>
+#include <my_global.h>
 #include <m_ctype.h>
 #include <my_sys.h>
 #include <m_string.h>
--- a/extra/resolve_stack_dump.c
+++ b/extra/resolve_stack_dump.c
@ -20,7 +20,7 @@
 */

 #define DONT_USE_RAID
-#include <global.h>
+#include <my_global.h>
 #include <m_ctype.h>
 #include <my_sys.h>
 #include <m_string.h>
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@ -19,7 +19,7 @@

 #define RESOLVE_VERSION "2.0"
 
-#include <global.h>
+#include <my_global.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #ifndef HAVE_BROKEN_NETINET_INCLUDES
--- a/fs/libmysqlfs.h
+++ b/fs/libmysqlfs.h
@ -16,7 +16,7 @@
 */
 #include "CorbaFS.h"

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
--- a/fs/mysqlcorbafs.h
+++ b/fs/mysqlcorbafs.h
@ -16,7 +16,7 @@
 */
 #include "CorbaFS.h"

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
--- a/heap/hp_test1.c
+++ b/heap/hp_test1.c
@ -20,7 +20,7 @@
   raderas.
 */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "heap.h"
--- a/include/Makefile.am
+++ b/include/Makefile.am
@ -22,7 +22,7 @@ pkginclude_HEADERS =	dbug.h m_string.h my_sys.h mysql.h mysql_com.h \
 			my_global.h my_net.h \
 			sslopt-case.h sslopt-longopts.h sslopt-usage.h \
 			sslopt-vars.h $(BUILT_SOURCES)
-noinst_HEADERS =	global.h config-win.h \
+noinst_HEADERS =	config-win.h \
 			nisam.h heap.h merge.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\
 			my_dir.h mysys_err.h my_base.h \
@ -32,12 +32,12 @@ noinst_HEADERS =	global.h config-win.h \
 			mysql_version.h.in

 # mysql_version.h are generated
-SUPERCLEANFILES =	mysql_version.h my_global.h my_config.h
+SUPERCLEANFILES =	mysql_version.h my_config.h

 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h

-all-local:		my_global.h my_config.h
+all-local:		my_config.h

 # Since we include my_config.h it better exist from the beginning
 link_sources:
@ -48,11 +48,6 @@ link_sources:
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h

-# This should be changed in the source and removed.
-my_global.h: global.h
-	$(RM) -f my_global.h
-	$(CP) global.h my_global.h
-
 # These files should not be included in distributions since they are
 # generated by configure from the .h.in files
 dist-hook:
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@ -17,7 +17,7 @@

 /*
  A better inplementation of the UNIX ctype(3) library.
-  Notes:   global.h should be included before ctype.h
+  Notes:   my_global.h should be included before ctype.h
 */

 #ifndef _m_ctype_h
--- a/include/my_base.h
+++ b/include/my_base.h
@ -24,7 +24,7 @@
 #ifndef stdin				/* Included first in handler */
 #define USES_TYPES			/* my_dir with sys/types is included */
 #define CHSIZE_USED
-#include <global.h>
+#include <my_global.h>
 #include <my_dir.h>			/* This includes types */
 #include <my_sys.h>
 #include <m_string.h>
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@ -36,7 +36,7 @@ be defined:
 /* Include two header files from MySQL to make the Unix flavor used
 in compiling more Posix-compatible. We assume that 'innobase' is a
 subdirectory of 'mysql'. */
-#include <global.h>
+#include <my_global.h>
 #include <my_pthread.h>

 /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
--- a/libmysql/dll.c
+++ b/libmysql/dll.c
@ -19,7 +19,7 @@
 ** Handling initialization of the dll library
 */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <my_pthread.h>

--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@ -18,7 +18,7 @@
 /* Error messages for MySQL clients */
 /* error messages for the daemon is in share/language/errmsg.sys */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include "errmsg.h"

--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@ -19,7 +19,7 @@
 ** Ask for a password from tty
 ** This is an own file to avoid conflicts with curses
 */
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include "mysql.h"
 #include <m_string.h>
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@ -15,7 +15,7 @@
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
   MA 02111-1307, USA */

-#include <global.h>
+#include <my_global.h>
 #if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)
 #include <winsock.h>
 #include <odbcinst.h>
@ -70,7 +70,7 @@ my_string	mysql_unix_port=0;
 #endif

 #if defined(MSDOS) || defined(__WIN__)
-// socket_errno is defined in global.h for all platforms
+// socket_errno is defined in my_global.h for all platforms
 #define perror(A)
 #else
 #include <errno.h>
--- a/libmysql/net.c
+++ b/libmysql/net.c
@ -30,7 +30,7 @@
 #ifdef __WIN__
 #include <winsock.h>
 #endif
-#include <global.h>
+#include <my_global.h>
 #include <mysql_com.h>
 #include <violite.h>
 #include <my_sys.h>
--- a/libmysql/password.c
+++ b/libmysql/password.c
@ -35,7 +35,7 @@
  This saves a hashed number as a string in the password field.
 *****************************************************************************/

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql.h"
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@ -12,7 +12,7 @@
 * modified is included with the above copyright notice.
 *
 */
-#include "global.h"
+#include "my_global.h"
 #include "my_pthread.h"
 #include "sys/types.h"
 #include "../regex/regex.h"
--- a/libmysqld/lib_vio.c
+++ b/libmysqld/lib_vio.c
@ -22,7 +22,7 @@
  the file descriptior.
 */

-#include <global.h>
+#include <my_global.h>

 #ifndef HAVE_VIO			/* is Vio suppored by the Vio lib ? */

--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@ -16,7 +16,7 @@
   MA 02111-1307, USA */

 #define DONT_USE_RAID
-#include <global.h>
+#include <my_global.h>
 #if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)
 #include <winsock.h>
 #include <odbcinst.h>
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@ -128,7 +128,7 @@ DO_GDB=""
 DO_DDD=""
 DO_CLIENT_GDB=""
 SLEEP_TIME=2
-CHARACTER_SET=latin1_de
+CHARACTER_SET=latin1
 DBUSER=""

 while test $# -gt 0; do
--- a/mysql-test/r/ctype_latin1_de.result
+++ b/mysql-test/r/ctype_latin1_de.result
@ -9,6 +9,8 @@ aeae	33
 ääa	32
 aeb	6
 Äc	5
+é	38
+É	39
 eä	28
 o	37
 oc	15
@ -36,8 +38,6 @@ ueb	12
 üc	7
 uf	13
 uü	29
-И	38
-и	39
 a	b
 a	35
 ac	2
@ -49,6 +49,8 @@ aeae	33
 ääa	32
 aeb	6
 Äc	5
+é	38
+É	39
 eä	28
 o	37
 oc	15
@ -76,11 +78,7 @@ ueb	12
 üc	7
 uf	13
 uü	29
-И	38
-и	39
 a
-и
-И
 uü
 uf
 üc
@ -108,6 +106,8 @@ od
 oc
 o
 eä
+É
+é
 Äc
 aeb
 ääa
@ -121,11 +121,11 @@ a
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 a	b
+ö	14
 Öa	16
 Öc	19
 öo	30
 a	b
-И	38
 É	39
 a	b
 a	35
@ -166,3 +166,10 @@ strcmp('
 1	1	1	1
 strcmp('u','öa')	strcmp('u','ö')
 1	1
+a
+abc
+abcd
+a
+test
+a
+test
--- a/mysql-test/r/func_like.result
+++ b/mysql-test/r/func_like.result
@ -2,6 +2,9 @@ a
 abc
 abcd
 a
+abc
+abcd
+a
 test
 a
 test
--- a/mysql-test/t/ctype_latin1_de.test
+++ b/mysql-test/t/ctype_latin1_de.test
@ -14,7 +14,7 @@ select a,b from t1 order by upper(a),b;
 select a from t1 order by a desc;
 check table t1;
 select * from t1 where a like "ö%";
-select * from t1 where a like "%É%";
+select * from t1 where a like binary "%É%";
 select * from t1 where a like "%Á%";
 select * from t1 where a like "%U%";
 select * from t1 where a like "%ss%";
@ -34,3 +34,13 @@ select strcmp('af','
 select strcmp('ßa','ss'),strcmp('ssa','ß'),strcmp('sssb','sßa'),strcmp('ß','s');
 select strcmp('u','öa'),strcmp('u','ö');

+#
+# Some other simple tests with the current character set
+#
+
+create table t1 (a varchar(10), key(a));
+insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test");
+select * from t1 where a like "abc%"; 
+select * from t1 where a like "test%"; 
+select * from t1 where a like "te_t"; 
+drop table t1;
--- a/mysql-test/t/func_like.test
+++ b/mysql-test/t/func_like.test
@ -2,9 +2,11 @@
 # Test of like
 #

+drop table if exists t1;
 create table t1 (a varchar(10), key(a));
 insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test");
 select * from t1 where a like "abc%"; 
+select * from t1 where a like "ABC%"; 
 select * from t1 where a like "test%"; 
 select * from t1 where a like "te_t"; 
 drop table t1;
--- a/mysys/checksum.c
+++ b/mysys/checksum.c
@ -17,7 +17,7 @@

 /* Calculate a long checksum for a memoryblock. Used to verify pack_isam */

-#include <global.h>
+#include <my_global.h>
 #include "my_sys.h"

 ulong checksum(const byte *mem, uint count)
--- a/mysys/getopt.c
+++ b/mysys/getopt.c
@ -46,7 +46,7 @@ Cambridge, MA 02139, USA.  */
 #endif
 #endif

-#include <global.h>				/* Changes for mysys */
+#include <my_global.h>				/* Changes for mysys */
 #include <m_string.h>

 /* Comment out all this code if we are using the GNU C Library, and are not
--- a/mysys/getopt1.c
+++ b/mysys/getopt1.c
@ -24,7 +24,7 @@ Cambridge, MA 02139, USA.  */
 #include <config.h>
 #endif

-#include <global.h>
+#include <my_global.h>
 #include "getopt.h"

 #if (!defined (__STDC__) || !__STDC__) && !defined(MSDOS) && !defined(OS2)
--- a/mysys/make-conf.c
+++ b/mysys/make-conf.c
@ -34,7 +34,7 @@
 #define CH_INCLUDE STRINGIZE(CH_SRC)

 /* aaaah, that's better */
-#include <my_global.h>
+#include <my_my_global.h>
 #include CH_INCLUDE

 #include <stdio.h>
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@ -17,7 +17,7 @@

 /* Routines to handle mallocing of results which will be freed the same time */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>

--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@ -16,7 +16,7 @@
   MA 02111-1307, USA */

 #define USES_TYPES
-#include "global.h"
+#include "my_global.h"

 #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2)
 #include "mysys_priv.h"
--- a/mysys/my_compress.c
+++ b/mysys/my_compress.c
@ -17,7 +17,7 @@

 /* Written by Sinisa Milivojevic <sinisa@mysql.com> */

-#include <global.h>
+#include <my_global.h>
 #ifdef HAVE_COMPRESS
 #include <my_sys.h>
 #include <zlib.h>
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@ -15,7 +15,7 @@
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
   MA 02111-1307, USA */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>

 #ifdef USE_SYSTEM_WRAPPERS
--- a/mysys/test_charset.c
+++ b/mysys/test_charset.c
@ -15,7 +15,7 @@
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
   MA 02111-1307, USA */

-#include <global.h>
+#include <my_global.h>
 #include <m_ctype.h>
 #include <my_sys.h>
 #include <mysql_version.h>
--- a/mysys/testhash.c
+++ b/mysys/testhash.c
@ -17,7 +17,7 @@

 /* Test av hash libarary: stor test */

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <hash.h>
 #include <m_string.h>
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@ -15,7 +15,7 @@
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
   MA 02111-1307, USA */

-#include <global.h>
+#include <my_global.h>

 #if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
 #include <errno.h>
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@ -17,7 +17,7 @@

 /* This makes a wrapper for mutex handling to make it easier to debug mutex */

-#include <global.h>
+#include <my_global.h>
 #if defined(HAVE_LINUXTHREADS) && !defined (__USE_UNIX98)
 #define __USE_UNIX98			/* To get rw locks under Linux */
 #endif
--- a/regex/debug.c
+++ b/regex/debug.c
@ -1,4 +1,4 @@
-#include <global.h>
+#include <my_global.h>
 #include <m_ctype.h>
 #include <m_string.h>
 #include <sys/types.h>
--- a/regex/main.c
+++ b/regex/main.c
@ -1,4 +1,4 @@
-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include <sys/types.h>
 #include <regex.h>
--- a/regex/regcomp.c
+++ b/regex/regcomp.c
@ -1,4 +1,4 @@
-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include <m_ctype.h>
 #include <regex.h>
--- a/regex/regerror.c
+++ b/regex/regerror.c
@ -1,4 +1,4 @@
-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include <m_ctype.h>
 #include <regex.h>
--- a/regex/regexec.c
+++ b/regex/regexec.c
@ -5,7 +5,7 @@
 * macros that code uses.  This lets the same code operate on two different
 * representations for state sets.
 */
-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include <m_ctype.h>
 #include <regex.h>
--- a/regex/regexp.c
+++ b/regex/regexp.c
@ -58,7 +58,7 @@
 */

 /* Headers */
-#include "global.h"
+#include "my_global.h"
 #include <ctype.h>
 #include "regexp.h"
 #ifdef	__WIN__
--- a/regex/regfree.c
+++ b/regex/regfree.c
@ -1,4 +1,4 @@
-#include <global.h>
+#include <my_global.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/regex/reginit.c
+++ b/regex/reginit.c
@ -1,6 +1,6 @@
 /* Init cclasses array from ctypes */

-#include <global.h>
+#include <my_global.h>
 #include <m_ctype.h>
 #include <m_string.h>
 #include "cclass.h"
--- a/sql/cache_manager.cc
+++ b/sql/cache_manager.cc
@ -18,7 +18,7 @@
 #pragma implementation		       /* gcc: Class implementation */
 #endif

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include "cache_manager.h"

--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@ -16,7 +16,7 @@


 #define NO_YACC_SYMBOLS
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #ifndef __GNU_LIBRARY__
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@ -365,11 +365,9 @@ berkeley_cmp_packed_key(DB *file, const DBT *new_key, const DBT *saved_key)
    {
      if (*new_key_ptr != *saved_key_ptr++)
 	return ((int) *new_key_ptr - (int) saved_key_ptr[-1]);
+      key_length--;
      if (!*new_key_ptr++)
-      {
-	key_length--;
 	continue;
-      }
    }
    if ((cmp=key_part->field->pack_cmp(new_key_ptr,saved_key_ptr,
 				       key_part->length)))
@ -1399,7 +1397,7 @@ int ha_berkeley::index_read_idx(byte * buf, uint keynr, const byte * key,
  statistic_increment(ha_read_key_count,&LOCK_status);
  DBUG_ENTER("index_read_idx");
  current_row.flags=DB_DBT_REALLOC;
-  active_index= -1;
+  active_index= (uint) -1;
  DBUG_RETURN(read_row(key_file[keynr]->get(key_file[keynr], transaction,
 				 pack_key(&last_key, keynr, key_buff, key,
 					  key_len),
--- a/sql/ha_gemini.h
+++ b/sql/ha_gemini.h
@ -19,7 +19,7 @@
 #pragma interface			/* gcc class implementation */
 #endif

-#include "gem_global.h"
+#include "gem_my_global.h"
 #include "dstd.h"
 #include "dsmpub.h"

--- a/sql/handler.cc
+++ b/sql/handler.cc
@ -839,14 +839,16 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
  }
  error=table.file->create(name,&table,create_info);
  VOID(closefrm(&table));
-  if (error) {
-    if (table.db_type == DB_TYPE_INNOBASE) {
+  if (error)
+  {
+    if (table.db_type == DB_TYPE_INNODB)
+    {
      /* Creation of InnoDB table cannot fail because of an OS error:
 	 put error as the number */
      my_error(ER_CANT_CREATE_TABLE,MYF(ME_BELL+ME_WAITTANG),name,error);
-    } else {
-      my_error(ER_CANT_CREATE_TABLE,MYF(ME_BELL+ME_WAITTANG),name,my_errno);
    }
+    else
+      my_error(ER_CANT_CREATE_TABLE,MYF(ME_BELL+ME_WAITTANG),name,my_errno);
  }
  DBUG_RETURN(error != 0);
 }
--- a/sql/item.cc
+++ b/sql/item.cc
@ -231,6 +231,22 @@ void Item_int::print(String *str)
  str->append(name);
 }

+String *Item_uint::val_str(String *str)
+{
+  str->set((ulonglong) value);
+  return str;
+}
+
+void Item_uint::print(String *str)
+{
+  if (!name)
+  {
+    str_value.set((ulonglong) value);
+    name=str_value.c_ptr();
+  }
+  str->append(name);
+}
+

 String *Item_real::val_str(String *str)
 {
@ -317,6 +333,12 @@ void Item_int::make_field(Send_field *tmp_field)
  init_make_field(tmp_field,FIELD_TYPE_LONGLONG);
 }

+void Item_uint::make_field(Send_field *tmp_field)
+{
+  init_make_field(tmp_field,FIELD_TYPE_LONGLONG);
+  tmp_field->flags|= UNSIGNED_FLAG;
+}
+
 void Item_real::make_field(Send_field *tmp_field)
 {
  init_make_field(tmp_field,FIELD_TYPE_DOUBLE);
--- a/sql/item.h
+++ b/sql/item.h
@ -181,6 +181,19 @@ public:
 };


+class Item_uint :public Item_int
+{
+public:
+  Item_uint(const char *str_arg, uint length) :
+    Item_int(str_arg, (longlong) strtoull(str_arg,(char**) 0,10), length) {}
+  double val() { return ulonglong2double(value); }
+  String *val_str(String*);
+  void make_field(Send_field *field);
+  Item *new_item() { return new Item_uint(name,max_length); }
+  void print(String *str);
+};
+
+
 class Item_real :public Item
 {
 public:
--- a/sql/matherr.c
+++ b/sql/matherr.c
@ -16,7 +16,7 @@

 /* Fix that we got POSTFIX_ERROR when doing unreasonable math (not core) */

-#include <global.h>
+#include <my_global.h>
 #include <errno.h>

 	/* Fix that we gets POSTFIX_ERROR when error in math */
--- a/sql/md5.c
+++ b/sql/md5.c
@ -28,7 +28,7 @@ documentation and/or software.
   Replace of MD5_memset and MD5_memcpy with memset & memcpy
 */

-#include <global.h>
+#include <my_global.h>
 #include <m_string.h>
 #include "md5.h"

--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@ -40,7 +40,7 @@ inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __a
 #define thr_got_alarm(A) 0
 #endif

-#include <global.h>
+#include <my_global.h>
 #include <mysql_com.h>
 #include <violite.h>
 #include <my_sys.h>
--- a/sql/my_lock.c
+++ b/sql/my_lock.c
@ -19,7 +19,7 @@
 #else

 #undef MAP_TO_USE_RAID			/* Avoid RAID mappings */
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <mysys_err.h>
 #include <my_pthread.h>
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@ -17,7 +17,7 @@
 #ifndef _MYSQL_PRIV_H
 #define _MYSQL_PRIV_H

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql_version.h"
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@ -30,7 +30,7 @@
 #ifdef __WIN__
 #include <winsock.h>
 #endif
-#include <global.h>
+#include <my_global.h>
 #include <mysql_com.h>
 #include <violite.h>
 #include <my_sys.h>
--- a/sql/password.c
+++ b/sql/password.c
@ -34,7 +34,7 @@
  This saves a hashed number as a string in the password field.
 *****************************************************************************/

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include "mysql.h"
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@ -337,7 +337,8 @@ static const char *longlong_str="9223372036854775807";
 static const uint longlong_len=19;
 static const char *signed_longlong_str="-9223372036854775808";
 static const uint signed_longlong_len=19;
-
+static const char *unsigned_longlong_str="18446744073709551615";
+static const uint unsigned_longlong_len=20;

 inline static uint int_token(const char *str,uint length)
 {
@ -393,7 +394,13 @@ inline static uint int_token(const char *str,uint length)
    else if (length < longlong_len)
      return LONG_NUM;
    else if (length > longlong_len)
-      return REAL_NUM;
+    {
+      if (length > unsigned_longlong_len)
+	return REAL_NUM;
+      cmp=unsigned_longlong_str;
+      smaller=ULONGLONG_NUM;
+      bigger=REAL_NUM;
+    }
    else
    {
      cmp=longlong_str;
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@ -17,7 +17,7 @@

 /* Function with list databases, tables or fields */

-#include "global.h"
+#include "my_global.h"
 #include "mysql_priv.h"
 #include "sql_select.h"                         // For select_describe
 #include "sql_acl.h"
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@ -21,7 +21,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif

-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@ -43,7 +43,7 @@ inline Item *or_or_concat(Item* A, Item* B)
 %union {
  int  num;
  ulong ulong_num;
-  ulonglong ulonglong_num;
+  ulonglong ulonglong_number;
  LEX_STRING lex_str;
  LEX_STRING *lex_str_ptr;
  LEX_SYMBOL symbol;
@ -349,6 +349,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	TINYBLOB
 %token	TINYINT
 %token	TINYTEXT
+%token	ULONGLONG_NUM
 %token	UNSIGNED
 %token	VARBINARY
 %token	VARCHAR
@ -465,7 +466,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);

 %type <lex_str>
 	IDENT TEXT_STRING REAL_NUM FLOAT_NUM NUM LONG_NUM HEX_NUM LEX_HOSTNAME
-	field_ident select_alias ident ident_or_text
+	ULONGLONG_NUM field_ident select_alias ident ident_or_text

 %type <lex_str_ptr>
 	opt_table_alias
@ -488,8 +489,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %type <ulong_num>
 	ULONG_NUM raid_types

-%type <ulonglong_num>
-	ULONGLONG_NUM
+%type <ulonglong_number>
+	ulonglong_num

 %type <item>
 	literal text_literal insert_ident group_ident order_ident
@ -652,7 +653,7 @@ master_def:
 	 Lex->mi.port = $3;
       }
       |
-       MASTER_LOG_POS_SYM EQ ULONGLONG_NUM
+       MASTER_LOG_POS_SYM EQ ulonglong_num
       {
 	 Lex->mi.pos = $3;
       }
@ -766,12 +767,12 @@ create_table_options:

 create_table_option:
 	TYPE_SYM EQ table_types		{ Lex->create_info.db_type= $3; }
-	| MAX_ROWS EQ ULONGLONG_NUM	{ Lex->create_info.max_rows= $3; }
-	| MIN_ROWS EQ ULONGLONG_NUM	{ Lex->create_info.min_rows= $3; }
+	| MAX_ROWS EQ ulonglong_num	{ Lex->create_info.max_rows= $3; }
+	| MIN_ROWS EQ ulonglong_num	{ Lex->create_info.min_rows= $3; }
 	| AVG_ROW_LENGTH EQ ULONG_NUM	{ Lex->create_info.avg_row_length=$3; }
 	| PASSWORD EQ TEXT_STRING	{ Lex->create_info.password=$3.str; }
 	| COMMENT_SYM EQ TEXT_STRING	{ Lex->create_info.comment=$3.str; }
-	| AUTO_INC EQ ULONGLONG_NUM	{ Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;}
+	| AUTO_INC EQ ulonglong_num	{ Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;}
 	| PACK_KEYS_SYM EQ ULONG_NUM	{ Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; }
 	| CHECKSUM_SYM EQ ULONG_NUM	{ Lex->create_info.table_options|= $3 ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM; }
 	| DELAY_KEY_WRITE_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE; }
@ -2047,16 +2048,18 @@ delete_limit_clause:
 	{
 	  Select->select_limit= HA_POS_ERROR;
 	}
-	| LIMIT ULONGLONG_NUM
+	| LIMIT ulonglong_num
 	{ Select->select_limit= (ha_rows) $2; }

 ULONG_NUM:
 	NUM	    { $$= strtoul($1.str,NULL,10); }
+	| ULONGLONG_NUM { $$= (ulonglong) strtoul($1.str,NULL,10); }
 	| REAL_NUM  { $$= strtoul($1.str,NULL,10); }
 	| FLOAT_NUM { $$= strtoul($1.str,NULL,10); }

-ULONGLONG_NUM:
+ulonglong_num:
 	NUM	    { $$= (ulonglong) strtoul($1.str,NULL,10); }
+	| ULONGLONG_NUM { $$= (ulonglong) strtoul($1.str,NULL,10); }
 	| LONG_NUM  { $$= strtoull($1.str,NULL,10); }
 	| REAL_NUM  { $$= strtoull($1.str,NULL,10); }
 	| FLOAT_NUM { $$= strtoull($1.str,NULL,10); }
@ -2417,7 +2420,7 @@ show_param:
 	      YYABORT;
 	  }
        | NEW_SYM MASTER_SYM FOR_SYM SLAVE WITH MASTER_LOG_FILE_SYM EQ 
-	  TEXT_STRING AND MASTER_LOG_POS_SYM EQ ULONGLONG_NUM AND
+	  TEXT_STRING AND MASTER_LOG_POS_SYM EQ ulonglong_num AND
 	MASTER_LOG_SEQ_SYM EQ ULONG_NUM AND MASTER_SERVER_ID_SYM EQ
 	ULONG_NUM
          {
@ -2499,7 +2502,7 @@ binlog_in:

 binlog_from:
 	/* empty */ { Lex->mi.pos = 4; /* skip magic number */ }
-        | FROM ULONGLONG_NUM { Lex->mi.pos = $2; }
+        | FROM ulonglong_num { Lex->mi.pos = $2; }


 /* A Oracle compatible synonym for show */
@ -2705,6 +2708,7 @@ literal:
 	text_literal	{ $$ =	$1; }
 	| NUM		{ $$ =	new Item_int($1.str, (longlong) atol($1.str),$1.length); }
 	| LONG_NUM	{ $$ =	new Item_int($1.str); }
+	| ULONGLONG_NUM	{ $$ =	new Item_uint($1.str, $1.length); }
 	| REAL_NUM	{ $$ =	new Item_real($1.str, $1.length); }
 	| FLOAT_NUM	{ $$ =	new Item_float($1.str, $1.length); }
 	| NULL_SYM	{ $$ =	new Item_null();
@ -2993,11 +2997,11 @@ option_value:
 	{
 	  current_thd->user_time=0;
 	}
-	| LAST_INSERT_ID equal ULONGLONG_NUM
+	| LAST_INSERT_ID equal ulonglong_num
 	{
 	  current_thd->insert_id($3);
 	}
-	| INSERT_ID equal ULONGLONG_NUM
+	| INSERT_ID equal ulonglong_num
 	{
 	  current_thd->next_insert_id=$3;
 	}
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@ -14,7 +14,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-#include <global.h>
+#include <my_global.h>
 #include "stacktrace.h"
 #include <signal.h>
 #include <my_pthread.h>
--- a/sql/udf_example.cc
+++ b/sql/udf_example.cc
@ -103,7 +103,7 @@
 #include <stdio.h>
 #include <string.h>
 #else
-#include <global.h>
+#include <my_global.h>
 #include <my_sys.h>
 #endif
 #include <mysql.h>
--- a/strings/atof.c
+++ b/strings/atof.c
@ -23,7 +23,7 @@
  Must be inited with init_my_atof to handle possibly overflows.
 */

-#include <global.h>
+#include <my_global.h>
 #ifdef USE_MY_ATOF				/* Skipp if we don't want it */
 #include <m_ctype.h>
 #include <floatingpoint.h>
--- a/strings/bchange.c
+++ b/strings/bchange.c
@ -25,7 +25,7 @@
    src in a buffer with tot_length bytes.
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 void bchange(register char *dst, uint old_length, register const char *src, uint new_length, uint tot_length)
--- a/strings/bcmp.c
+++ b/strings/bcmp.c
@ -22,7 +22,7 @@
  Now only used with purify.
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 #if !defined(bcmp) && !defined(HAVE_BCMP)
--- a/strings/bfill.c
+++ b/strings/bfill.c
@ -12,7 +12,7 @@
    code is presented for your interest and amusement.
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 #if !defined(bfill) && !defined(HAVE_BFILL)
--- a/strings/bmove.c
+++ b/strings/bmove.c
@ -19,7 +19,7 @@
    code is presented for your interest and amusement.
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 #if !defined(HAVE_BMOVE) && !defined(bmove)
--- a/strings/bmove512.c
+++ b/strings/bmove512.c
@ -27,7 +27,7 @@
    fastest way to move a mutiple of 512 byte.
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 #ifndef bmove512
--- a/strings/bmove_upp.c
+++ b/strings/bmove_upp.c
@ -24,7 +24,7 @@
    "src-len" to the destination "dst-len" counting downwards.
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 #if defined(MC68000) && defined(DS90)
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@ -28,7 +28,7 @@
 * .configure. mbmaxlen_big5=2
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"
 #include "m_ctype.h"

--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@ -67,7 +67,7 @@

 #ifdef REAL_MYSQL

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 #else
@ -427,7 +427,7 @@ my_bool my_like_range_czech(const char *ptr,uint ptr_length,pchar escape,
 *
 * definition table reworked by Jaromir Dolecek <dolecek@ics.muni.cz>
 */
-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 uchar NEAR ctype_czech[257] = {
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@ -27,7 +27,7 @@
 * .configure. mbmaxlen_euc_kr=2
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 uchar NEAR ctype_euc_kr[257] =
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@ -25,7 +25,7 @@
 * .configure. mbmaxlen_gb2312=2
 */

-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"

 uchar NEAR ctype_gb2312[257] =
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@ -28,7 +28,7 @@
 */


-#include <global.h>
+#include <my_global.h>
 #include "m_string.h"
 #include "m_ctype.h"

--- a/Show more
+++ b/Show more