diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:13:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:13:54 +0200 |
| commit | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (patch) | |
| tree | 6fb814b28d2a0b8227b7a9f835f2b888c2a2596f /sql/field.cc | |
| parent | 60561ae6133cf40f4fc445e1d6e8f395a20b2573 (diff) | |
| parent | 115a2967563d3ac734ce371260098710ba42cdf0 (diff) | |
| download | mariadb-git-1fd8150a5b5e3f56aa3c253225929a07ee9a4026.tar.gz | |
5.1 merge
increase xtradb verson from 13.0 to 13.01
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 2a52963afa9..ec58731ad9a 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -10271,6 +10271,17 @@ Create_field::Create_field(Field *old_field,Field *orig_field) geom_type= ((Field_geom*)old_field)->geom_type; break; #endif + case MYSQL_TYPE_YEAR: + if (length != 4) + { + char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; + 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), + buff, "YEAR(4)"); + } + break; default: break; } |