merge from parent

d9037d41 · Horst Hunger · fab8db2c · 6e38be1d · d9037d41
Commit d9037d41 authored Jul 23, 2008 by Horst Hunger
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/field.cc sql/field.cc +2 -1

No files found.
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6644,6 +6644,7 @@ struct Check_field_param {
  Field *field;
 };

+#ifdef HAVE_REPLICATION
 static bool
 check_field_for_37426(const void *param_arg)
 {
@@ -6655,7 +6656,7 @@ check_field_for_37426(const void *param_arg)
                       param->field->row_pack_length()));
  return param->field->row_pack_length() > 255;
 }
-
+#endif

 int Field_string::compatible_field_size(uint field_metadata,
                                        const Relay_log_info *rli_arg)