Skip to content

Commit 6dee2e5

Browse files
committed
MDEV-39287 (11.4 part) Fix compilation problems with glibc 2.43/gcc 16/fedora 44
Trick compiler with ==.
1 parent 5f2d75c commit 6dee2e5

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

include/mysql/plugin_audit.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/plugin_auth.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/plugin_data_type.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/plugin_encryption.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/plugin_ftparser.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/plugin_function.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/plugin_password_validation.h.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
int res1, res2;
6060
unsigned int d1, d2= *dlen;
6161
assert(*dlen >= slen);
62-
assert((dst[*dlen - 1]= 1));
62+
assert((dst[*dlen - 1]= 1) == 1);
6363
if (src < dst)
6464
assert(src + slen <= dst);
6565
else

include/mysql/service_encryption.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
121121

122122
// Verify dlen is initialized properly. See MDEV-30389
123123
assert(*dlen >= slen);
124-
assert((dst[*dlen - 1]= 1));
124+
assert((dst[*dlen - 1]= 1) == 1);
125125
// Verify buffers do not overlap
126126
if (src < dst)
127127
assert(src + slen <= dst);

0 commit comments

Comments
 (0)