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, 32 insertions, 21 deletions

diff --git a/sql/time.cc b/sql/time.cc
index 1597368908d..aadc32964ff 100644
--- a/sql/time.cc
+++ b/sql/time.cc
@@ -268,13 +268,13 @@ void find_date(string pos,uint *vek,uint flag)
   DBUG_PRINT("enter",("pos: '%s'  flag: %d",pos,flag));
 
   bzero((char*) vek,sizeof(int)*4);
-  while (*pos && !isdigit(*pos))
+  while (*pos && !my_isdigit(system_charset_info,*pos))
     pos++;
   length=(uint) strlen(pos);
   for (uint i=0 ; i< 3; i++)
   {
     start=pos; value=0;
-    while (isdigit(pos[0]) &&
+    while (my_isdigit(system_charset_info,pos[0]) &&
 	   ((pos-start) < 2 || ((pos-start) < 4 && length >= 8 &&
 				!(flag & 3))))
     {
@@ -282,7 +282,8 @@ void find_date(string pos,uint *vek,uint flag)
       pos++;
     }
     vek[flag & 3]=value; flag>>=2;
-    while (*pos && (ispunct(*pos) || isspace(*pos)))
+    while (*pos && (my_ispunct(system_charset_info,*pos) || 
+                    my_isspace(system_charset_info,*pos)))
       pos++;
   }
   DBUG_PRINT("exit",("year: %d  month: %d  day: %d",vek[0],vek[1],vek[2]));
@@ -434,7 +435,8 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date)
   DBUG_ENTER("str_to_TIME");
   DBUG_PRINT("enter",("str: %.*s",length,str));
 
-  for (; str != end && !isdigit(*str) ; str++) ; // Skip garbage
+  // Skip garbage
+  for (; str != end && !my_isdigit(system_charset_info, *str) ; str++) ; 
   if (str == end)
     DBUG_RETURN(TIMESTAMP_NONE);
   /*
@@ -442,14 +444,14 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date)
   ** If length= 8 or >= 14 then year is of format YYYY.
      (YYYY-MM-DD,  YYYYMMDD, YYYYYMMDDHHMMSS)
   */
-  for (pos=str; pos != end && isdigit(*pos) ; pos++) ;
+  for (pos=str; pos != end && my_isdigit(system_charset_info,*pos) ; pos++) ;
   digits= (uint) (pos-str);
   year_length= (digits == 4 || digits == 8 || digits >= 14) ? 4 : 2;
   field_length=year_length-1;
-  for (i=0 ; i < 6 && str != end && isdigit(*str) ; i++)
+  for (i=0 ; i < 6 && str != end && my_isdigit(system_charset_info,*str) ; i++)
   {
     uint tmp_value=(uint) (uchar) (*str++ - '0');
-    while (str != end && isdigit(str[0]) && field_length--)
+    while (str != end && my_isdigit(system_charset_info,str[0]) && field_length--)
     {
       tmp_value=tmp_value*10 + (uint) (uchar) (*str - '0');
       str++;
@@ -459,10 +461,12 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date)
       str++;					// ISO8601:  CCYYMMDDThhmmss
     else if ( i != 5 ) 				// Skip inter-field delimiters 
     {
-      while (str != end && (ispunct(*str) || isspace(*str)))
+      while (str != end && 
+             (my_ispunct(system_charset_info,*str) || 
+              my_isspace(system_charset_info,*str)))
       {
 	// Only allow space between days and hours
-	if (isspace(*str) && i != 2)
+	if (my_isspace(system_charset_info,*str) && i != 2)
 	  DBUG_RETURN(TIMESTAMP_NONE);
 	str++;
       }
@@ -470,12 +474,13 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date)
     field_length=1;				// Rest fields can only be 2
   }
   /* Handle second fractions */
-  if (i == 6 && (uint) (end-str) >= 2 && *str == '.' && isdigit(str[1]))
+  if (i == 6 && (uint) (end-str) >= 2 && *str == '.' && 
+      my_isdigit(system_charset_info,str[1]))
   {
     str++;
     uint tmp_value=(uint) (uchar) (*str - '0');
     field_length=3;
-    while (str++ != end && isdigit(str[0]) && field_length--)
+    while (str++ != end && my_isdigit(system_charset_info,str[0]) && field_length--)
       tmp_value=tmp_value*10 + (uint) (uchar) (*str - '0');
     date[6]=tmp_value;
   }
@@ -498,7 +503,7 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date)
   {
     for (; str != end ; str++)
     {
-      if (!isspace(*str))
+      if (!my_isspace(system_charset_info,*str))
       {
 	current_thd->cuted_fields++;
 	break;
@@ -559,7 +564,8 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
   uint state;
 
   l_time->neg=0;
-  for (; str != end && !isdigit(*str) && *str != '-' ; str++)
+  for (; str != end && 
+         !my_isdigit(system_charset_info,*str) && *str != '-' ; str++)
     length--;
   if (str != end && *str == '-')
   {
@@ -578,7 +584,7 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
   }
 
   /* Not a timestamp. Try to get this as a DAYS_TO_SECOND string */
-  for (value=0; str != end && isdigit(*str) ; str++)
+  for (value=0; str != end && my_isdigit(system_charset_info,*str) ; str++)
     value=value*10L + (long) (*str - '0');
 
   if (*str == ' ')
@@ -589,14 +595,16 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
 
   LINT_INIT(state);
   found_days=found_hours=0;
-  if ((uint) (end-str) > 1 && (*str == ' ' && isdigit(str[1])))
+  if ((uint) (end-str) > 1 && (*str == ' ' && 
+      my_isdigit(system_charset_info,str[1])))
   {						// days !
     date[0]=value;
     state=1;					// Assume next is hours
     found_days=1;
     str++;					// Skip space;
   }
-  else if ((end-str) > 1 && *str == ':' && isdigit(str[1]))
+  else if ((end-str) > 1 && *str == ':' && 
+           my_isdigit(system_charset_info,str[1]))
   {
     date[0]=0;					// Assume we found hours
     date[1]=value;
@@ -618,10 +626,11 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
   /* Read hours, minutes and seconds */
   for (;;)
   {
-    for (value=0; str != end && isdigit(*str) ; str++)
+    for (value=0; str != end && my_isdigit(system_charset_info,*str) ; str++)
       value=value*10L + (long) (*str - '0');
     date[state++]=value;
-    if (state == 4 || (end-str) < 2 || *str != ':' || !isdigit(str[1]))
+    if (state == 4 || (end-str) < 2 || *str != ':' || 
+        !my_isdigit(system_charset_info,str[1]))
       break;
     str++;					// Skip ':'
   }
@@ -641,11 +650,13 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
 
  fractional:
   /* Get fractional second part */
-  if ((end-str) >= 2 && *str == '.' && isdigit(str[1]))
+  if ((end-str) >= 2 && *str == '.' && my_isdigit(system_charset_info,str[1]))
   {
     uint field_length=3;
     str++; value=(uint) (uchar) (*str - '0');
-    while (++str != end && isdigit(str[0]) && field_length--)
+    while (++str != end && 
+           my_isdigit(system_charset_info,str[0]) && 
+           field_length--)
       value=value*10 + (uint) (uchar) (*str - '0');
     date[4]=value;
   }
@@ -670,7 +681,7 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
   {
     do
     {
-      if (!isspace(*str))
+      if (!my_isspace(system_charset_info,*str))
       {
 	current_thd->cuted_fields++;
 	break;