auto-merge

659e76d8 · Gleb Shchepa · e65c2918 · 521deaf3 · 659e76d8 · 659e76d8
Commit 659e76d8 authored Jun 29, 2012 by Gleb Shchepa
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

sql/sql_yacc.yy sql/sql_yacc.yy +1 -1

No files found.
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -9933,7 +9933,7 @@ Create_field::Create_field(Field *old_field,Field *orig_field)
    if (length != 4)
    {
      char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
-      snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
+      my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
      push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
                          ER_WARN_DEPRECATED_SYNTAX,
                          ER(ER_WARN_DEPRECATED_SYNTAX),

--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5473,7 +5473,7 @@ type:
              if (errno == 0 && length <= MAX_FIELD_BLOBLENGTH && length != 4)
              {
                char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
-                snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
+                my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE,
                                    ER_WARN_DEPRECATED_SYNTAX,
                                    ER(ER_WARN_DEPRECATED_SYNTAX),