Merge with 4.0.17

1 files changed, 5 insertions, 3 deletions

diff --git a/sql/field.h b/sql/field.h
index 508fbad41a1..223ff4135d4 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -872,11 +872,12 @@ public:
 		  enum utype unireg_check_arg, const char *field_name_arg,
 		  struct st_table *table_arg, CHARSET_INFO *cs)
     :Field_str(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
-	       unireg_check_arg, field_name_arg, table_arg, cs) {};
+	       unireg_check_arg, field_name_arg, table_arg, cs)
+  {}
   Field_varstring(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
-		  struct st_table *table_arg, CHARSET_INFO *cs)
     :Field_str((char*) 0,len_arg, maybe_null_arg ? (uchar*) "": 0,0,
-	       NONE, field_name_arg, table_arg, cs) {};
+	       NONE, field_name_arg, table_arg, cs)
+  {}
 
   enum_field_types type() const { return FIELD_TYPE_VAR_STRING; }
   enum ha_base_keytype key_type() const
@@ -927,6 +928,7 @@ public:
     {
       flags|= BLOB_FLAG;
     }
+   }
   enum_field_types type() const { return FIELD_TYPE_BLOB;}
   enum ha_base_keytype key_type() const
     { return binary() ? HA_KEYTYPE_VARBINARY : HA_KEYTYPE_VARTEXT; }