Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/dbdata/psergey/mysql-4.1-root

sql/item.cc

@@ -756,8 +756,7 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
   if (entry && entry->value)
   {
     item_result_type= entry->type;
-    switch (entry->type)
-    {
+    switch (entry->type) {
     case REAL_RESULT:
       set_double(*(double*)entry->value);
       break;
@@ -788,8 +787,8 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
 
       if (set_str((const char *)entry->value, entry->length))
         DBUG_RETURN(1);
-        }
       break;
+    }
     default:
       DBUG_ASSERT(0);
       set_null();