Merge with 4.0.3

Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)

1 files changed, 8 insertions, 5 deletions

diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c
index c54f17a186e..f19ef467b5c 100644
--- a/extra/resolve_stack_dump.c
+++ b/extra/resolve_stack_dump.c
@@ -175,9 +175,9 @@ trace dump and specify the path to it with -s or --symbols-file");
 static uchar hex_val(char c)
 {
   uchar l;
-  if (isdigit(c))
+  if (my_isdigit(system_charset_info,c))
     return c - '0';
-  l = tolower(c);
+  l = my_tolower(system_charset_info,c);
   if (l < 'a' || l > 'f')
     return HEX_INVALID; 
   return (uchar)10 + ((uchar)c - (uchar)'a');
@@ -203,9 +203,11 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf)
 
   if (!se->addr)
     return -1;
-  while (isspace(*buf++)) ;
+  while (my_isspace(system_charset_info,*buf++))
+    /* empty */;
 
-  while (isspace(*buf++)) ; /* skip more space */
+  while (my_isspace(system_charset_info,*buf++))
+    /* empty - skip more space */;
   --buf;
   /* now we are on the symbol */
   for (p = se->symbol, p_end = se->symbol + sizeof(se->symbol) - 1;
@@ -285,7 +287,8 @@ static void do_resolve()
   while (fgets(buf, sizeof(buf), fp_dump))
   {
     p = buf;
-    while(isspace(*p))
+    /* skip space */
+    while (my_isspace(system_charset_info,*p))
       ++p;
 
     if (*p++ == '0' && *p++ == 'x')