diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-28 12:07:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:25 +0100 |
| commit | cc71e7501cb623b2d600c47dbe10a31dcf6e8fcf (patch) | |
| tree | 40e7fc721aef0c68e2c0c60c42dcf8825e0f051e /sql | |
| parent | f2a0c758da3d9f0fa42c96114b453cf4835bcbab (diff) | |
| download | mariadb-git-cc71e7501cb623b2d600c47dbe10a31dcf6e8fcf.tar.gz | |
post-merge: -Werror fixes in 10.2
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/spatial.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index 2aca528dd15..5f045f8cbfa 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -238,17 +238,17 @@ int Geometry::as_wkt(String *wkt, const char **end) static const uchar type_keyname[]= "type"; -static const int type_keyname_len= 4; +static const uint type_keyname_len= 4; static const uchar coord_keyname[]= "coordinates"; -static const int coord_keyname_len= 11; +static const uint coord_keyname_len= 11; static const uchar geometries_keyname[]= "geometries"; -static const int geometries_keyname_len= 10; +static const uint geometries_keyname_len= 10; static const uchar features_keyname[]= "features"; -static const int features_keyname_len= 8; +static const uint features_keyname_len= 8; static const uchar geometry_keyname[]= "geometry"; -static const int geometry_keyname_len= 8; +static const uint geometry_keyname_len= 8; -static const int max_keyname_len= 11; /*'coordinates' keyname is the longest.*/ +static const uint max_keyname_len= 11; /*'coordinates' keyname is the longest.*/ static const uchar feature_type[]= "feature"; static const int feature_type_len= 7; |