Flush DBUG log in case of DBUG_ASSERT()

Added strings_def.h into strings library to be able to have a DBUG_ASSERT() version without _db_flush() call (as strings.a should not depend on dbug.a)
Remove include of m_string.h in all string files (as it's included by string_def.h).
Fixed include order.
Changed "m_ctype.h" -> <m_ctype.h>

 

include/my_dbug.h:
  Flush DBUG log in case of DBUG_ASSERT()
strings/bchange.c:
  Include strings_def.h
strings/bcmp.c:
  Include strings_def.h
strings/bfill.c:
  Include strings_def.h
strings/bmove.c:
  Include strings_def.h
strings/bmove512.c:
  Include strings_def.h
strings/bmove_upp.c:
  Include strings_def.h
strings/conf_to_src.c:
  Include strings_def.h
  Fixed copyright
strings/ctype-big5.c:
  Include strings_def.h
strings/ctype-bin.c:
  Include strings_def.h
strings/ctype-cp932.c:
  Include strings_def.h
strings/ctype-czech.c:
  Include strings_def.h
strings/ctype-euc_kr.c:
  Include strings_def.h
strings/ctype-eucjpms.c:
  Include strings_def.h
strings/ctype-extra.c:
  Include strings_def.h
strings/ctype-gbk.c:
  Include strings_def.h
strings/ctype-latin1.c:
  Include strings_def.h
strings/ctype-mb.c:
  Include strings_def.h
strings/ctype-simple.c:
  Include strings_def.h
strings/ctype-sjis.c:
  Include strings_def.h
strings/ctype-tis620.c:
  Include strings_def.h
strings/ctype-uca.c:
  Include strings_def.h
strings/ctype-ucs2.c:
  Include strings_def.h
strings/ctype-ujis.c:
  Include strings_def.h
strings/ctype-utf8.c:
  Include strings_def.h
strings/ctype-win1250ch.c:
  Include strings_def.h
strings/ctype.c:
  Include strings_def.h
strings/decimal.c:
  Include strings_def.h
strings/do_ctype.c:
  Include strings_def.h
strings/int2str.c:
  Include strings_def.h
strings/is_prefix.c:
  Include strings_def.h
strings/llstr.c:
  Include strings_def.h
strings/longlong2str.c:
  Include strings_def.h
strings/longlong2str_asm.c:
  Include strings_def.h
strings/my_strchr.c:
  Include strings_def.h
strings/my_strtoll10.c:
  Include strings_def.h
strings/my_vsnprintf.c:
  Include strings_def.h
strings/r_strinstr.c:
  Include strings_def.h
strings/str2int.c:
  Include strings_def.h
strings/str_alloc.c:
  Include strings_def.h
strings/str_test.c:
  Include strings_def.h
  Fixed compiler warnings
strings/strappend.c:
  Include strings_def.h
strings/strcend.c:
  Include strings_def.h
strings/strcont.c:
  Include strings_def.h
strings/strend.c:
  Include strings_def.h
strings/strfill.c:
  Include strings_def.h
strings/strinstr.c:
  Include strings_def.h
strings/strmake.c:
  Include strings_def.h
strings/strmov.c:
  Include strings_def.h
strings/strmov_overlapp.c:
  Include strings_def.h
strings/strnlen.c:
  Include strings_def.h
strings/strnmov.c:
  Include strings_def.h
strings/strstr.c:
  Include strings_def.h
strings/strto.c:
  Include strings_def.h
strings/strtod.c:
  Include strings_def.h
strings/strtol.c:
  Include strings_def.h
strings/strtoll.c:
  Include strings_def.h
strings/strtoul.c:
  Include strings_def.h
strings/strtoull.c:
  Include strings_def.h
strings/strxmov.c:
  Include strings_def.h
strings/strxnmov.c:
  Include strings_def.h
strings/uctypedump.c:
  Include strings_def.h
  Fixed compiler warnings
  Removed double include of m_ctype.h
strings/udiv.c:
  Include strings_def.h
strings/xml.c:
  Include strings_def.h

66 files changed, 137 insertions, 179 deletions

diff --git a/include/my_dbug.h b/include/my_dbug.h
index e1cd4e2b7dc..3c1eb820028 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -126,7 +126,7 @@ extern  void _db_flush_();
 #define DBUG_END()  _db_end_ ()
 #define DBUG_LOCK_FILE _db_lock_file_()
 #define DBUG_UNLOCK_FILE _db_unlock_file_()
-#define DBUG_ASSERT(A) assert(A)
+#define DBUG_ASSERT(A) do { _db_flush_(); assert(A); } while(0)
 #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
 #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
 #define DEBUGGER_OFF                    do { _dbug_on_= 0; } while(0)
diff --git a/strings/bchange.c b/strings/bchange.c
index 0b2c62019b5..3a054efdb0a 100644
--- a/strings/bchange.c
+++ b/strings/bchange.c
@@ -23,8 +23,7 @@
     src in a buffer with tot_length bytes.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 void bchange(register uchar *dst, size_t old_length, register const uchar *src,
 	     size_t new_length, size_t tot_length)
diff --git a/strings/bcmp.c b/strings/bcmp.c
index 39b5f24e055..e34c47ca596 100644
--- a/strings/bcmp.c
+++ b/strings/bcmp.c
@@ -21,8 +21,7 @@
   comparing a shorter string with bcmp.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #ifdef HAVE_valgrind
 #undef bcmp
diff --git a/strings/bfill.c b/strings/bfill.c
index 2750553f48a..9ca9e6b551b 100644
--- a/strings/bfill.c
+++ b/strings/bfill.c
@@ -29,8 +29,7 @@
     code is presented for your interest and amusement.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #if !defined(bfill) && !defined(HAVE_BFILL)
 
diff --git a/strings/bmove.c b/strings/bmove.c
index ae9641a5d58..f94f262d7b4 100644
--- a/strings/bmove.c
+++ b/strings/bmove.c
@@ -36,8 +36,7 @@
     code is presented for your interest and amusement.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #if !defined(HAVE_BMOVE) && !defined(bmove)
 
diff --git a/strings/bmove512.c b/strings/bmove512.c
index 0ae23d1f42d..308646c0586 100644
--- a/strings/bmove512.c
+++ b/strings/bmove512.c
@@ -25,8 +25,7 @@
     fastest way to move a mutiple of 512 byte.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #ifndef bmove512
 
diff --git a/strings/bmove_upp.c b/strings/bmove_upp.c
index fb47bda2d1d..fa136751b76 100644
--- a/strings/bmove_upp.c
+++ b/strings/bmove_upp.c
@@ -22,8 +22,7 @@
     "src-len" to the destination "dst-len" counting downwards.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #if defined(MC68000) && defined(DS90)
 
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index aa40a269848..f64346e353c 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -13,8 +13,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 <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 #include <fcntl.h>
 #include <my_xml.h>
@@ -250,7 +249,7 @@ static void
 fprint_copyright(FILE *file)
 {
   fprintf(file,
-"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n"
+"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems Inc., 2010-2011 Monty Program Ab\n"
 "\n"
 "   This program is free software; you can redistribute it and/or modify\n"
 "   it under the terms of the GNU General Public License as published by\n"
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 2cb40c266d2..7f2c5019ad3 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -26,9 +26,8 @@
  * .configure. mbmaxlen_big5=2
  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_big5
 
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 95d97af2bfb..ed5cf86c4e2 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -18,9 +18,8 @@
 /* This file is for binary pseudo charset, created by bar@mysql.com */
 
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 static uchar ctype_bin[]=
 {
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index 238c6f61baa..a2b7f1da2da 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c
@@ -16,9 +16,8 @@
 /* This file is for cp932 charaset (Windows Japanese),
    and created based on ctype-sjis.c file  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_cp932
 
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index a5df86cc6b3..a06804262a7 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -65,9 +65,8 @@
 
 #ifdef REAL_MYSQL
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #else
 
@@ -427,8 +426,7 @@ static my_bool my_like_range_czech(CHARSET_INFO *cs __attribute__((unused)),
  *
  * definition table reworked by Jaromir Dolecek <dolecek@ics.muni.cz>
  */
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 static uchar NEAR ctype_czech[257] = {
 0,
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index ee957304716..bd506ba7708 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -25,9 +25,8 @@
  * .configure. mbmaxlen_euc_kr=2
  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_euckr
 
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 615981b4d27..832bf1f849e 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -26,9 +26,8 @@ ctype-ujis.c file.
  * .configure. mbmaxlen_eucjpms=3
  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_eucjpms
 
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c
index 64cf30e3673..bf9e31bfa18 100644
--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@@ -21,7 +21,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_dec8
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 84f67dbbc2e..18a048e7c57 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -23,9 +23,8 @@
  * .configure. mbmaxlen_gb2312=2
  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_gb2312
 
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 89607823d34..56d2fed3bce 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -26,9 +26,8 @@
  */
 
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_gbk
 
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index e5333c4101b..fb2f166ece8 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -13,9 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 static uchar ctype_latin1[] = {
     0,
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 6e79d791b17..eb82f8f3806 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -13,9 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
-#include "m_ctype.h"
-#include "m_string.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef USE_MB
 
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 4f3aaa6f668..84ccf9358a0 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -13,9 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 #include "my_sys.h"  /* Needed for MY_ERRNO_ERANGE */
 #include <errno.h>
 
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index f52974e879e..b96bc0df342 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -16,9 +16,8 @@
 /* This file is for Shift JIS charset, and created by tommy@valley.ne.jp.
  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_sjis
 
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index a8c05dc4fd0..995d5302f49 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -47,11 +47,10 @@
  * .configure. strxfrm_multiply_tis620=4
  */
 
-#include <my_global.h>
-#include <my_sys.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 #include "t_ctype.h"
+#include <my_sys.h>
 
 #ifdef HAVE_CHARSET_tis620
 
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 3d08e466ca3..0966c124cca 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -32,10 +32,8 @@
 */
 
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
-
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #define MY_UCA_CNT_FLAG_SIZE 4096
 #define MY_UCA_CNT_FLAG_MASK 4095
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 9e37518fb1b..ca82c71a1d2 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -17,11 +17,9 @@
 
 /* UCS2 support. Written by Alexander Barkov <bar@mysql.com> */
 
-#include <my_global.h>
+#include "strings_def.h"
+#include <m_ctype.h>
 #include <my_sys.h>
-#include "m_string.h"
-#include "m_ctype.h"
-#include <errno.h>
 #include <stdarg.h>
 
 
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 4474bd0cf96..596d8bc1723 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -25,9 +25,8 @@
  * .configure. mbmaxlen_ujis=3
  */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifdef HAVE_CHARSET_ujis
 
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 9cfee43fa36..0b688d62856 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -18,10 +18,8 @@
 /* UTF8 according RFC 2279 */
 /* Written by Alexander Barkov <bar@udm.net> */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
-#include <errno.h>
+#include "strings_def.h"
+#include <m_ctype.h>
 
 #ifndef EILSEQ
 #define EILSEQ ENOENT
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index b22b4364e8a..1e4c390d7fc 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -40,8 +40,7 @@
 #ifdef REAL_MYSQL
 
 #include "my_global.h"
-#include "m_string.h"
-#include "m_ctype.h"
+#include <m_ctype.h>
 
 #else
 
diff --git a/strings/ctype.c b/strings/ctype.c
index 75d76aceea3..41b81b6591c 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -13,13 +13,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 #include <my_xml.h>
-#ifndef SCO
-#include <m_string.h>
-#endif
-
 
 /*
 
diff --git a/strings/decimal.c b/strings/decimal.c
index 236b62b9296..65919296f61 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -99,11 +99,10 @@
       implementation-defined.
 */
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <m_ctype.h>
 #include <myisampack.h>
 #include <my_sys.h> /* for my_alloca */
-#include <m_string.h>
 #include <decimal.h>
 
 /*
diff --git a/strings/do_ctype.c b/strings/do_ctype.c
index f33ddc5eb81..91e29c55158 100644
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.c
@@ -20,10 +20,9 @@
 #undef DBUG_OFF
 #endif
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <ctype.h>
 #include <my_sys.h>
-#include "m_string.h"
 
 uchar NEAR to_upper[256];
 uchar NEAR to_lower[256],NEAR sort_order[256];
diff --git a/strings/int2str.c b/strings/int2str.c
index fba98aac3f1..f784e5ec717 100644
--- a/strings/int2str.c
+++ b/strings/int2str.c
@@ -13,8 +13,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 <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 /*
   _dig_vec arrays are public because they are used in several outer places.
diff --git a/strings/is_prefix.c b/strings/is_prefix.c
index 451cd468b7e..f116e6bf1bf 100644
--- a/strings/is_prefix.c
+++ b/strings/is_prefix.c
@@ -21,8 +21,7 @@
     A empty t is allways a prefix.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 int is_prefix(register const char *s, register const char *t)
 {
diff --git a/strings/llstr.c b/strings/llstr.c
index 678f8b05f39..fdbe1b6f6dc 100644
--- a/strings/llstr.c
+++ b/strings/llstr.c
@@ -24,8 +24,7 @@
 */
 
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 char *llstr(longlong value,char *buff)
 {
diff --git a/strings/longlong2str.c b/strings/longlong2str.c
index d7de5bb0f7c..e25143b00f9 100644
--- a/strings/longlong2str.c
+++ b/strings/longlong2str.c
@@ -37,8 +37,7 @@
 	itoa assumes that 10 -base numbers are allways signed and other arn't.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #if defined(HAVE_LONG_LONG) && !defined(longlong2str) && !defined(HAVE_LONGLONG2STR)
 
diff --git a/strings/longlong2str_asm.c b/strings/longlong2str_asm.c
index 637815e52c5..1689b2582b4 100644
--- a/strings/longlong2str_asm.c
+++ b/strings/longlong2str_asm.c
@@ -20,8 +20,7 @@
   _dig_vector in a portable manner.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 extern char *longlong2str_with_dig_vector(longlong val,char *dst,int radix,
                                           const char *dig_vector);
diff --git a/strings/my_strchr.c b/strings/my_strchr.c
index 6724bf39ff2..8c471b1ab3a 100644
--- a/strings/my_strchr.c
+++ b/strings/my_strchr.c
@@ -21,9 +21,8 @@
   frequently.
 */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 
 
 char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
index 4f73b1f8e71..f8e3825b441 100644
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@@ -13,9 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <my_sys.h>            /* Needed for MY_ERRNO_ERANGE */
-#include <m_string.h>
 
 #undef  ULONGLONG_MAX
 /*
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 920022aae91..a39cfb7083a 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -13,10 +13,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
-#include <m_string.h>
-#include <stdarg.h>
+#include "strings_def.h"
 #include <m_ctype.h>
+#include <stdarg.h>
 
 /*
   Limited snprintf() implementations
diff --git a/strings/r_strinstr.c b/strings/r_strinstr.c
index fb1e0c5a090..e342f72ed52 100644
--- a/strings/r_strinstr.c
+++ b/strings/r_strinstr.c
@@ -22,8 +22,7 @@
   the pattern counted from the begining of the string.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 size_t r_strinstr(reg1 const char * str, size_t from, reg4 const char * search)
 {
diff --git a/strings/str2int.c b/strings/str2int.c
index c4a4c07eeff..1bee56d1846 100644
--- a/strings/str2int.c
+++ b/strings/str2int.c
@@ -37,9 +37,8 @@
   call has no problems.
 */
 
-#include <my_global.h>
-#include "m_string.h"
-#include "m_ctype.h"
+#include "strings_def.h"
+#include <m_ctype.h>
 #include "my_sys.h"			/* defines errno */
 #include <errno.h>
 
diff --git a/strings/str_alloc.c b/strings/str_alloc.c
index 615ad1ba1e2..bb20fde0f56 100644
--- a/strings/str_alloc.c
+++ b/strings/str_alloc.c
@@ -13,8 +13,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 <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 
 static void *my_str_malloc_default(size_t size)
 {
diff --git a/strings/str_test.c b/strings/str_test.c
index 3ddfca39419..3ad1392f185 100644
--- a/strings/str_test.c
+++ b/strings/str_test.c
@@ -15,9 +15,8 @@
 
 /* Test of all stringfunktions that is coded in assembler */
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <stdarg.h>
-#include "m_string.h"
 
 #define F_LEN	8
 #define F_CHAR	'A'
@@ -50,10 +49,10 @@ int main(void)
   errors=tests=0;
   init_strings();
 
-  test_arg("bcmp(from,to,5)",(long) my_test(bcmp(from,to,5)),1L);
-  test_arg("bcmp(from,from,5)",(long) bcmp(from,from,5),0L);
+  test_arg("bcmp(from,to,5)",(long) my_test(bcmp((uchar*) from, (uchar*) to,5)),1L);
+  test_arg("bcmp(from,from,5)",(long) bcmp((uchar*) from, (uchar*) from,5),0L);
 
-  test_arg("bcmp(from,to,0)",(long) bcmp(from,to,0),0L);
+  test_arg("bcmp(from,to,0)",(long) bcmp((uchar*) from, (uchar*) to,0),0L);
   test_arg("strend(from)",(long) strend(from),(long) from+F_LEN);
   test_arg("strchr(v1,'M')",(long) strchr(v1,'M'),(long) v1);
   test_arg("strchr(v1,'y')",(long) strchr(v1,'y'),(long) v1+4);
@@ -90,10 +89,10 @@ int main(void)
   test_strarg("bmove(to,from,4)",(bmove(to,from,4),0L),INT_MAX32,4,F_CHAR,
 	      0,0);
   test_strarg("bmove(to,from,0)",(bmove(to,from,0),0L),INT_MAX32,0,0);
-  test_strarg("bmove_upp(to+6,from+6,3)",(bmove_upp(to+6,from+6,3),0L),INT_MAX32,
+  test_strarg("bmove_upp(to+6,from+6,3)",(bmove_upp((uchar*) to+6, (uchar*) from+6,3),0L),INT_MAX32,
 	       3,T_CHAR,3,F_CHAR,0,0);
-  test_strarg("bmove_upp(to,from,0)",(bmove_upp(to,from,0),0L),INT_MAX32,0,0);
-  test_strarg("bmove_align(to,from,8)",(bmove_align(to,from,8),0L),INT_MAX32,
+  test_strarg("bmove_upp(to,from,0)",(bmove_upp((uchar*) to, (uchar*) from,0),0L),INT_MAX32,0,0);
+  test_strarg("bmove_align(to,from,8)",(bmove_align((uchar*) to, (uchar*) from,8),0L),INT_MAX32,
 	      8,F_CHAR,0,0);
   test_strarg("strappend(to,3,' ')",(strappend(to,3,' '),0L),INT_MAX32,
 	      3,T_CHAR,1,0,T_LEN-4,T_CHAR,1,0,0,0);
@@ -124,7 +123,7 @@ int main(void)
   test_strarg("strxnmov(to,2,\"!!\",NullS)",strxnmov(to,2,"!!","xx",NullS),to+2,2,'!',0,0,0);
   test_strarg("strxnmov(to,2,\"!\",\"x\",\"y\",NullS)",strxnmov(to,2,"!","x","y",NullS),to+2,1,'!',1,'x',0,0,0);
 
-  test_strarg("bchange(to,2,from,4,6)",(bchange(to,2,from,4,6),0L),INT_MAX32,
+  test_strarg("bchange(to,2,from,4,6)",(bchange((uchar*) to,2,(uchar*) from,4,6),0L),INT_MAX32,
 	      4,F_CHAR,2,T_CHAR,0,0);
 
   printf("tests: %d  errors: %d\n",tests,errors);
@@ -233,7 +232,7 @@ int compare_buff(const char *message, char * b1, char * b2, int length,
 {
   int i,error=0;
 
-  if (bcmp(b1,b2,length))
+  if (bcmp((uchar*) b1, (uchar*) b2, length))
   {
     errors++;
     printf("func: '%s'   Buffers differ\nIs:        ",message);
@@ -259,19 +258,19 @@ int compare_buff(const char *message, char * b1, char * b2, int length,
   return error;
 } /* compare_buff */
 
-	/* These are here to be loaded and examined */
+	/* These are here to be loaded and examined in debugger */
 
 extern void dummy_functions(void);
 
 void dummy_functions(void)
 {
-  VOID(memchr(from,'a',5));
-  VOID(memcmp(from,to,5));
-  VOID(memcpy(from,to,5));
-  VOID(memset(from,' ',5));
-  VOID(strcmp(from,to));
-  VOID(strcpy(from,to));
-  VOID(strstr(from,to));
-  VOID(strrchr(from,'a'));
+  (void) memchr(from,'a',5);
+  (void) memcmp(from,to,5);
+  (void) memcpy(from,to,5);
+  (void) memset(from,' ',5);
+  (void) strcmp(from,to);
+  (void) strcpy(from,to);
+  (void) strstr(from,to);
+  (void) strrchr(from,'a');
   return;
 }
diff --git a/strings/strappend.c b/strings/strappend.c
index bb926f74665..1a95da673a7 100644
--- a/strings/strappend.c
+++ b/strings/strappend.c
@@ -23,8 +23,7 @@
     trunked. The des+len character is allways set to NULL.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 
 void strappend(register char *s, size_t len, pchar fill)
diff --git a/strings/strcend.c b/strings/strcend.c
index 56e31d5f994..426995f5f31 100644
--- a/strings/strcend.c
+++ b/strings/strcend.c
@@ -22,8 +22,7 @@
     occurs,  or a pointer to the end-null of s if c does not occur in s.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #if defined(MC68000) && defined(DS90)
 
diff --git a/strings/strcont.c b/strings/strcont.c
index 5a518a3550f..9041d84b1c1 100644
--- a/strings/strcont.c
+++ b/strings/strcont.c
@@ -24,8 +24,7 @@
 
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 char * strcont(reg1 const char *str,reg2 const char *set)
 {
diff --git a/strings/strend.c b/strings/strend.c
index 4dadf0675dc..18facccdc3f 100644
--- a/strings/strend.c
+++ b/strings/strend.c
@@ -27,8 +27,7 @@
     Beware: the asm version works only if strlen(s) < 65535.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #if	VaxAsm
 
diff --git a/strings/strfill.c b/strings/strfill.c
index 4b1fe67b206..9f30ef07548 100644
--- a/strings/strfill.c
+++ b/strings/strfill.c
@@ -23,8 +23,7 @@
     strfill() returns pointer to dest+len;
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 char * strfill(char *s, size_t len, pchar fill)
 {
diff --git a/strings/strings_def.h b/strings/strings_def.h
new file mode 100644
index 00000000000..0430e9cd4d6
--- /dev/null
+++ b/strings/strings_def.h
@@ -0,0 +1,31 @@
+/* Copyright (C) 2011 Monty Program 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; version 2 of the License.
+
+   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 */
+
+/* This file is to be include first in all files in the string directory */
+
+#include <my_global.h>		/* Define standar vars */
+#include "m_string.h"		/* Exernal defintions of string functions */
+
+/*
+  We can't use the original DBUG_ASSERT() (which includes _db_flush())
+  in the strings library as libdbug is compiled after the the strings
+  library and we don't want to have strings depending on libdbug which
+  depends on mysys and strings.
+*/
+
+#if !defined(DBUG_OFF)
+#undef DBUG_ASSERT
+#define DBUG_ASSERT(A) assert(A)
+#endif
diff --git a/strings/strinstr.c b/strings/strinstr.c
index dce498d61e8..8f2e4ecd1ee 100644
--- a/strings/strinstr.c
+++ b/strings/strinstr.c
@@ -25,8 +25,7 @@
     char is 1.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 size_t strinstr(reg1 const char *str,reg4 const char *search)
 {
diff --git a/strings/strmake.c b/strings/strmake.c
index 56bd3a8f084..761a0cdc5f7 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -24,8 +24,7 @@
     strmake() returns pointer to closing null
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 char *strmake(register char *dst, register const char *src, size_t length)
 {
diff --git a/strings/strmov.c b/strings/strmov.c
index 5112ad8d90e..322c9f9ec04 100644
--- a/strings/strmov.c
+++ b/strings/strmov.c
@@ -21,8 +21,7 @@
   into dst, which seems useful.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #ifndef strmov
 
diff --git a/strings/strmov_overlapp.c b/strings/strmov_overlapp.c
index 4cc3e294620..59d980fc7c4 100644
--- a/strings/strmov_overlapp.c
+++ b/strings/strmov_overlapp.c
@@ -13,8 +13,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 <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 /* A trivial implementation */
 char *strmov_overlapp(char *dst, const char *src)
diff --git a/strings/strnlen.c b/strings/strnlen.c
index 826cd5ae5dd..891087a6ebe 100644
--- a/strings/strnlen.c
+++ b/strings/strnlen.c
@@ -20,8 +20,7 @@
     strnlen(s, len) returns the length of s or len if s is longer than len.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #ifndef HAVE_STRNLEN
 
diff --git a/strings/strnmov.c b/strings/strnmov.c
index 7e26877637b..2087980429a 100644
--- a/strings/strnmov.c
+++ b/strings/strnmov.c
@@ -20,8 +20,7 @@
     truncated.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 char *strnmov(register char *dst, register const char *src, size_t n)
 {
diff --git a/strings/strstr.c b/strings/strstr.c
index a5b50d12043..b19fb39724c 100644
--- a/strings/strstr.c
+++ b/strings/strstr.c
@@ -27,8 +27,7 @@
 
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 #ifndef HAVE_STRSTR
 
diff --git a/strings/strto.c b/strings/strto.c
index fcb0d800b81..858d10a134f 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -40,7 +40,7 @@
    /* see 'strtoll.c' and 'strtoull.c' for the reasons */
 #endif
 
-#include "m_ctype.h"
+#include <m_ctype.h>
 #include "my_sys.h"			/* defines errno */
 #include <errno.h>
 
diff --git a/strings/strtod.c b/strings/strtod.c
index 4c9cf931cb3..5f2fd664da3 100644
--- a/strings/strtod.c
+++ b/strings/strtod.c
@@ -27,7 +27,7 @@
  */
 
 #include "my_base.h"			/* Includes errno.h + EOVERFLOW */
-#include "m_ctype.h"
+#include <m_ctype.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
diff --git a/strings/strtol.c b/strings/strtol.c
index 42476b0226a..b8269191aa7 100644
--- a/strings/strtol.c
+++ b/strings/strtol.c
@@ -20,8 +20,7 @@
    functions, especially they handle tricks for Tru64 where 'long' is
    64 bit already and our 'longlong' is just a 'long'.
  */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 
 #if !defined(MSDOS) && !defined(HAVE_STRTOL) && !defined(__WIN__)
 #include "strto.c"
diff --git a/strings/strtoll.c b/strings/strtoll.c
index cfb6fbd75ee..a619ca69546 100644
--- a/strings/strtoll.c
+++ b/strings/strtoll.c
@@ -24,8 +24,7 @@
    for 'strtoll()' but no implementation, see "6.1 New C99 library functions" 
    in file '/usr/share/doclib/cc.dtk/release_notes.txt'.
  */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 
 #if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)
 #define USE_LONGLONG
diff --git a/strings/strtoul.c b/strings/strtoul.c
index 3e2b51bc982..ce3b61c9b3f 100644
--- a/strings/strtoul.c
+++ b/strings/strtoul.c
@@ -20,8 +20,7 @@
    functions, especially they handle tricks for Tru64 where 'long' is
    64 bit already and our 'longlong' is just a 'long'.
  */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 
 #if !defined(MSDOS) && !defined(HAVE_STRTOUL)
 #define USE_UNSIGNED
diff --git a/strings/strtoull.c b/strings/strtoull.c
index 94bf6904f8d..76228ec0717 100644
--- a/strings/strtoull.c
+++ b/strings/strtoull.c
@@ -24,8 +24,7 @@
    for 'strtoull()' but no implementation, see "6.1 New C99 library functions" 
    in file '/usr/share/doclib/cc.dtk/release_notes.txt'.
  */
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 
 #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
 #define USE_UNSIGNED
diff --git a/strings/strxmov.c b/strings/strxmov.c
index d5d81fd9274..1f4a44b5b88 100644
--- a/strings/strxmov.c
+++ b/strings/strxmov.c
@@ -30,8 +30,7 @@
     character pointer, or not the same bit pattern as NullS.
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 
 char *strxmov(char *dst,const char *src, ...)
 {
diff --git a/strings/strxnmov.c b/strings/strxnmov.c
index 16469be6e45..4685affeac9 100644
--- a/strings/strxnmov.c
+++ b/strings/strxnmov.c
@@ -35,8 +35,7 @@
       if total-string-length >= length then dst[length] will be set to \0
 */
 
-#include <my_global.h>
-#include "m_string.h"
+#include "strings_def.h"
 #include <stdarg.h>
 
 char *strxnmov(char *dst, size_t len, const char *src, ...)
diff --git a/strings/uctypedump.c b/strings/uctypedump.c
index 2e484604fd3..3ae4b7935e1 100644
--- a/strings/uctypedump.c
+++ b/strings/uctypedump.c
@@ -13,15 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
-/*
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-*/
-#include <my_global.h>
-#include <m_string.h>
+#include "strings_def.h"
 #include <m_ctype.h>
-#include "m_ctype.h"
 
 
 typedef struct my_ctype_name_st
@@ -204,7 +197,7 @@ int main(int ac, char ** av)
       int charnum=0;
       int num=0;
       
-      printf("static unsigned char uctype_page%02X[256]=\n{\n",plane);
+      printf("static unsigned char uctype_page%02X[256]=\n{\n", (uint) plane);
       
       for(charnum=0;charnum<256;charnum++)
       {
@@ -231,7 +224,7 @@ int main(int ac, char ** av)
   {
     char plane_name[128]="NULL";
     if(uctype[plane].ctype){
-      sprintf(plane_name,"uctype_page%02X",plane);
+      sprintf(plane_name,"uctype_page%02X",(uint) plane);
     }
     printf("\t{%d,%s}%s\n",uctype[plane].pctype,plane_name,plane<255?",":"");
   }
diff --git a/strings/udiv.c b/strings/udiv.c
index 81ac01ee9c3..7655e52e2cb 100644
--- a/strings/udiv.c
+++ b/strings/udiv.c
@@ -15,7 +15,7 @@
 
 /* Do udiv and urem if machine dosn't have it */
 
-#include <my_global.h>
+#include "strings_def.h"
 #include <math.h>
 
 unsigned long udiv(long unsigned int a, long unsigned int b)
diff --git a/strings/xml.c b/strings/xml.c
index 14da69e088a..c87d5475497 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -14,7 +14,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "my_global.h"
-#include "m_string.h"
 #include "my_xml.h"