diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-11 18:36:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-11 18:36:33 +0200 |
| commit | 0821394ad1900bc4ba425c95c975068cc71b141b (patch) | |
| tree | 021594817199afd2fd0854d57e238dc7e19a00de /libmysqld/libmysql.c | |
| parent | 8a0e102d499748bcf8fea11745ade03ebf624fce (diff) | |
| download | mariadb-git-bb-10.5-MDEV-21907.tar.gz | |
MDEV-21907: Make GCC 9 happybb-10.5-MDEV-21907
Diffstat (limited to 'libmysqld/libmysql.c')
| -rw-r--r-- | libmysqld/libmysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index c57e89947a6..16e9651ab3a 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -4219,7 +4219,7 @@ static int stmt_fetch_row(MYSQL_STMT *stmt, uchar *row) (*my_bind->fetch_result)(my_bind, field, &row); truncation_count+= *my_bind->error; } - if (!((bit<<=1) & 255)) + if (!(bit= (uchar) (bit << 1))) { bit= 1; /* To next uchar */ null_ptr++; @@ -4419,7 +4419,7 @@ static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data) if (!(*null_ptr & bit)) (*my_bind->skip_result)(my_bind, field, &row); DBUG_ASSERT(row <= row_end); - if (!((bit<<=1) & 255)) + if (!(bit= (uchar) (bit << 1))) { bit= 1; /* To next uchar */ null_ptr++; |