diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-04 14:31:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-04 16:09:34 +0100 |
| commit | 7a474162598c6d708ff969b9fbd85851bac35ec7 (patch) | |
| tree | ffd41231e215503c22fd719bf5bfb52fc54646d3 /sql/field.cc | |
| parent | c4cb15e87ba8cf4f1e7fd8e7cda5c88098ecd515 (diff) | |
| download | mariadb-git-7a474162598c6d708ff969b9fbd85851bac35ec7.tar.gz | |
compilation failure on windows
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/field.cc b/sql/field.cc index f18b571a0d3..3fa1f1c99c8 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7897,13 +7897,13 @@ uint gis_field_options_read(const uchar *buf, uint buf_len, case FIELDGEOM_END: goto end_of_record; } - if (option_id > 0 and option_id <= 40) + if (option_id > 0 && option_id <= 40) cbuf+= 1; - else if (option_id > 40 and option_id <= 80) + else if (option_id > 40 && option_id <= 80) cbuf+= 2; - else if (option_id > 80 and option_id <= 120) + else if (option_id > 80 && option_id <= 120) cbuf+= 4; - else if (option_id > 120 and option_id <= 160) + else if (option_id > 120 && option_id <= 160) cbuf+= 8; else /* > 160 and <=255 */ cbuf+= cbuf[0] ? 1 + cbuf[0] : 3 + uint2korr(cbuf+1); |