database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

compilation failure on windows

Browse Source
This commit is contained in:
Sergei Golubchik
2014-12-04 14:31:31 +01:00
parent c4cb15e87b
commit 7a47416259
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/field.cc
View File

@@ -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);