bk commit into 5.1 tree (mskold:1.2545)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of mskold.  When mskold does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-19 16:41:05+01:00, mskold@stripped +3 -0
  item_func.cc, field.cc, sql_class.cc:
    Removed compiler warnings

  sql/field.cc@stripped, 2008-03-19 16:40:44+01:00, mskold@stripped +2 -0
    Removed compiler warnings

  sql/item_func.cc@stripped, 2008-03-19 16:40:44+01:00, mskold@stripped +8 -0
    Removed compiler warnings

  sql/sql_class.cc@stripped, 2008-03-19 16:40:44+01:00, mskold@stripped +2 -0
    Removed compiler warnings

diff -Nrup a/sql/field.cc b/sql/field.cc
--- a/sql/field.cc	2008-01-22 23:45:41 +01:00
+++ b/sql/field.cc	2008-03-19 16:40:44 +01:00
@@ -9697,6 +9697,8 @@ bool Create_field::init(THD *thd, char *
     }
   case MYSQL_TYPE_DECIMAL:
     DBUG_ASSERT(0); /* Was obsolete */
+  default:
+    break;
   }
   /* Remember the value of length */
   char_length= length;
diff -Nrup a/sql/item_func.cc b/sql/item_func.cc
--- a/sql/item_func.cc	2008-01-25 18:14:58 +01:00
+++ b/sql/item_func.cc	2008-03-19 16:40:44 +01:00
@@ -3974,6 +3974,8 @@ double user_var_entry::val_real(my_bool 
   case ROW_RESULT:
     DBUG_ASSERT(1);				// Impossible
     break;
+  default:
+    break;
   }
   return 0.0;					// Impossible
 }
@@ -4005,6 +4007,8 @@ longlong user_var_entry::val_int(my_bool
   case ROW_RESULT:
     DBUG_ASSERT(1);				// Impossible
     break;
+  default:
+    break;
   }
   return LL(0);					// Impossible
 }
@@ -4037,6 +4041,8 @@ String *user_var_entry::val_str(my_bool 
   case ROW_RESULT:
     DBUG_ASSERT(1);				// Impossible
     break;
+  default:
+    break;
   }
   return(str);
 }
@@ -4063,6 +4069,8 @@ my_decimal *user_var_entry::val_decimal(
     break;
   case ROW_RESULT:
     DBUG_ASSERT(1);				// Impossible
+    break;
+  default:
     break;
   }
   return(val);
diff -Nrup a/sql/sql_class.cc b/sql/sql_class.cc
--- a/sql/sql_class.cc	2008-02-12 18:21:07 +01:00
+++ b/sql/sql_class.cc	2008-03-19 16:40:44 +01:00
@@ -2071,6 +2071,8 @@ bool select_max_min_finder_subselect::se
         // This case should never be choosen
 	DBUG_ASSERT(0);
 	op= 0;
+      default:
+        break;
       }
     }
     cache->store(val_item);