manual merge

sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
strings/ctype-utf8.c:
  Auto merged

4 files changed, 44 insertions, 49 deletions

diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 865c9f494c8..de08c080b3b 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2790,7 +2790,7 @@ static void test_mb(CHARSET_INFO *cs, uchar *s)
 {
   while(*s)
   {
-    if(my_ismbhead_utf8(cs,*s))
+    if (my_ismbhead_utf8(cs,*s))
     {
       int len=my_mbcharlen_utf8(cs,*s);
       while(len--)
diff --git a/strings/ctype.c b/strings/ctype.c
index ba6dbaeb887..91fa1413259 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -218,14 +218,6 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
   struct my_cs_file_section_st *s;
   int    state= (int)((s=cs_file_sec(st->attr, (int) strlen(st->attr))) ? s->state : 0);
   
-#ifndef DBUG_OFF
-  if(0){
-    char   str[1024];
-    mstr(str,attr,len,sizeof(str)-1);
-    printf("VALUE %d %s='%s'\n",state,st->attr,str);
-  }
-#endif
-  
   switch (state) {
   case _CS_ID:
     i->cs.number= strtol(attr,(char**)NULL,10);
diff --git a/strings/decimal.c b/strings/decimal.c
index 18f920badd3..be403c5e3fb 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -1492,17 +1492,18 @@ decimal_round(decimal_t *from, decimal_t *to, int scale,
   {
     int do_inc= FALSE;
     DBUG_ASSERT(frac0+intg0 >= 0);
-    switch (round_digit)
-    {
+    switch (round_digit) {
     case 0:
     {
       dec1 *p0= buf0 + (frac1-frac0);
       for (; p0 > buf0; p0--)
+      {
         if (*p0)
         {
           do_inc= TRUE;
           break;
-        };
+        }
+      }
       break;
     }
     case 5:
@@ -1511,9 +1512,10 @@ decimal_round(decimal_t *from, decimal_t *to, int scale,
       do_inc= (x>5) || ((x == 5) &&
                         (mode == HALF_UP || (frac0+intg0 > 0 && *buf0 & 1)));
       break;
-    };
-    default:;
-    };
+    }
+    default:
+      break;
+    }
     if (do_inc)
     {
       if (frac0+intg0>0)
@@ -1567,9 +1569,9 @@ decimal_round(decimal_t *from, decimal_t *to, int scale,
       *buf1=1;
       to->intg++;
     }
-    /* Here we  check 999.9 -> 1000 case when we need to increase intg */
     else
     {
+      /* Here we  check 999.9 -> 1000 case when we need to increase intg */
       int first_dig= to->intg % DIG_PER_DEC1;
       /* first_dig==0 should be handled above in the 'if' */
       if (first_dig && (*buf1 >= powers10[first_dig]))
diff --git a/strings/xml.c b/strings/xml.c
index 17f1b400957..02ca3932c39 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -96,13 +96,13 @@ static int my_xml_scan(MY_XML_PARSER *p,MY_XML_ATTR *a)
     a->end=p->cur;
     lex=a->beg[0];
   }
-  else if ( (p->cur[0]=='"') || (p->cur[0]=='\'') )
+  else if ( (p->cur[0] == '"') || (p->cur[0] == '\'') )
   {
     p->cur++;
     for(  ; ( p->cur < p->end ) && (p->cur[0] != a->beg[0]); p->cur++)
     {}
     a->end=p->cur;
-    if (a->beg[0]==p->cur[0])p->cur++;
+    if (a->beg[0] == p->cur[0])p->cur++;
     a->beg++;
     my_xml_norm_text(a);
     lex=MY_XML_STRING;
@@ -169,8 +169,8 @@ static int my_xml_leave(MY_XML_PARSER *p, const char *str, uint slen)
   int  rc;
   
   /* Find previous '.' or beginning */
-  for( e=p->attrend; (e>p->attr) && (e[0]!='.') ; e--);
-  glen = (uint) ((e[0]=='.') ? (p->attrend-e-1) : p->attrend-e);
+  for( e=p->attrend; (e>p->attr) && (e[0] != '.') ; e--);
+  glen = (uint) ((e[0] == '.') ? (p->attrend-e-1) : p->attrend-e);
   
   if (str && (slen != glen))
   {
@@ -199,7 +199,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
   while ( p->cur < p->end )
   {
     MY_XML_ATTR a;
-    if(p->cur[0]=='<')
+    if (p->cur[0] == '<')
     {
       int lex;
       int question=0;
@@ -207,40 +207,40 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
       
       lex=my_xml_scan(p,&a);
       
-      if (MY_XML_COMMENT==lex)
+      if (MY_XML_COMMENT == lex)
       {
         continue;
       }
       
       lex=my_xml_scan(p,&a);
       
-      if (MY_XML_SLASH==lex)
+      if (MY_XML_SLASH == lex)
       {
-        if(MY_XML_IDENT!=(lex=my_xml_scan(p,&a)))
+        if (MY_XML_IDENT != (lex=my_xml_scan(p,&a)))
         {
           sprintf(p->errstr,"1: %s unexpected (ident wanted)",lex2str(lex));
           return MY_XML_ERROR;
         }
-        if(MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg)))
+        if (MY_XML_OK != my_xml_leave(p,a.beg,(uint) (a.end-a.beg)))
           return MY_XML_ERROR;
         lex=my_xml_scan(p,&a);
         goto gt;
       }
       
-      if (MY_XML_EXCLAM==lex)
+      if (MY_XML_EXCLAM == lex)
       {
         lex=my_xml_scan(p,&a);
         exclam=1;
       }
-      else if (MY_XML_QUESTION==lex)
+      else if (MY_XML_QUESTION == lex)
       {
         lex=my_xml_scan(p,&a);
         question=1;
       }
       
-      if (MY_XML_IDENT==lex)
+      if (MY_XML_IDENT == lex)
       {
-        if(MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))
+        if (MY_XML_OK != my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))
           return MY_XML_ERROR;
       }
       else
@@ -250,17 +250,18 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
         return MY_XML_ERROR;
       }
       
-      while ((MY_XML_IDENT==(lex=my_xml_scan(p,&a))) || (MY_XML_STRING==lex))
+      while ((MY_XML_IDENT == (lex=my_xml_scan(p,&a))) ||
+             (MY_XML_STRING == lex))
       {
         MY_XML_ATTR b;
-        if(MY_XML_EQ==(lex=my_xml_scan(p,&b)))
+        if (MY_XML_EQ == (lex=my_xml_scan(p,&b)))
         {
           lex=my_xml_scan(p,&b);
-          if ( (lex==MY_XML_IDENT) || (lex==MY_XML_STRING) )
+          if ( (lex == MY_XML_IDENT) || (lex == MY_XML_STRING) )
           {
-            if((MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))  ||
-               (MY_XML_OK!=my_xml_value(p,b.beg,(uint) (b.end-b.beg)))  ||
-               (MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
+            if ((MY_XML_OK != my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))  ||
+                (MY_XML_OK != my_xml_value(p,b.beg,(uint) (b.end-b.beg)))  ||
+                (MY_XML_OK != my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
               return MY_XML_ERROR;
           }
           else
@@ -270,19 +271,19 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
             return MY_XML_ERROR;
           }
         }
-        else if ( (MY_XML_STRING==lex) || (MY_XML_IDENT==lex) )
+        else if ((MY_XML_STRING == lex) || (MY_XML_IDENT == lex))
         {
-          if((MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg))) ||
-             (MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
+          if ((MY_XML_OK != my_xml_enter(p,a.beg,(uint) (a.end-a.beg))) ||
+              (MY_XML_OK != my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
            return MY_XML_ERROR;
         }
         else
           break;
       }
       
-      if (lex==MY_XML_SLASH)
+      if (lex == MY_XML_SLASH)
       {
-        if(MY_XML_OK!=my_xml_leave(p,NULL,0))
+        if (MY_XML_OK != my_xml_leave(p,NULL,0))
           return MY_XML_ERROR;
         lex=my_xml_scan(p,&a);
       }
@@ -290,23 +291,23 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
 gt:
       if (question)
       {
-        if (lex!=MY_XML_QUESTION)
+        if (lex != MY_XML_QUESTION)
         {
           sprintf(p->errstr,"6: %s unexpected ('?' wanted)",lex2str(lex));
           return MY_XML_ERROR;
         }
-        if(MY_XML_OK!=my_xml_leave(p,NULL,0))
+        if (MY_XML_OK != my_xml_leave(p,NULL,0))
           return MY_XML_ERROR;
         lex=my_xml_scan(p,&a);
       }
       
       if (exclam)
       {
-        if(MY_XML_OK!=my_xml_leave(p,NULL,0))
+        if (MY_XML_OK != my_xml_leave(p,NULL,0))
           return MY_XML_ERROR;
       }
       
-      if (lex!=MY_XML_GT)
+      if (lex != MY_XML_GT)
       {
         sprintf(p->errstr,"5: %s unexpected ('>' wanted)",lex2str(lex));
         return MY_XML_ERROR;
@@ -315,11 +316,11 @@ gt:
     else
     {
       a.beg=p->cur;
-      for ( ; (p->cur < p->end) && (p->cur[0]!='<')  ; p->cur++);
+      for ( ; (p->cur < p->end) && (p->cur[0] != '<')  ; p->cur++);
       a.end=p->cur;
       
       my_xml_norm_text(&a);
-      if (a.beg!=a.end)
+      if (a.beg != a.end)
       {
         my_xml_value(p,a.beg,(uint) (a.end-a.beg));
       }
@@ -381,7 +382,7 @@ uint my_xml_error_pos(MY_XML_PARSER *p)
   const char *s;
   for ( s=p->beg ; s<p->cur; s++)
   {
-    if (s[0]=='\n')
+    if (s[0] == '\n')
       beg=s;
   }
   return (uint) (p->cur-beg);
@@ -391,9 +392,9 @@ uint my_xml_error_lineno(MY_XML_PARSER *p)
 {
   uint res=0;
   const char *s;
-  for ( s=p->beg ; s<p->cur; s++)
+  for (s=p->beg ; s<p->cur; s++)
   {
-    if (s[0]=='\n')
+    if (s[0] == '\n')
       res++;
   }
   return res;