MDEV-34112 Replace one operator name keyword #3243
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
LinuxJedi
approved these changes
May 8, 2024
|
I'll also push 11a34e7 into 10.5 |
Alternative operator name keywords like `and`, `or`, `xor`, etc., are uncommon in MariaDB and can cause obscure build errors when the GCC flag `-fno-operator-names` is applied. Description of `-fno-operator-names`: https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html > Do not treat the operator name keywords `and`, `bitand`, `bitor`, > `compl`, `not`, `or` and `xor` as synonyms as keywords. Part of the build errors: /local/p4clients/pkgbuild-LdLa_/workspace/src/RDSMariaDB/sql/sql_select.cc:11171:28: error: expected ‘)’ before ‘and’ 11171 | DBUG_ASSERT(sel >= 0.0 and sel <= 1.00001); | ^~~ /local/p4clients/pkgbuild-LdLa_/workspace/src/RDSMariaDB/include/my_global.h:372:44: note: in definition of macro ‘unlikely’ 372 | #define unlikely(x) __builtin_expect(((x) != 0),0) | ^ ... The build failure is caused by using alternative operator name keywords `and` introduced in commit b66cdbd. Replace the `and` keyword with `&&` and target on MariaDB 11.0+ branches which include the commit. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Alternative operator name keywords like
and,or,xor, etc., are uncommon in MariaDB and can cause obscure build errors when the GCC flag-fno-operator-namesis applied.Description of
-fno-operator-names:https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html
Part of the build errors:
The build failure is caused by using alternative operator name keywords
andintroduced in commit b66cdbd.Replace the
andkeyword with&&and target on MariaDB 11.0+ branches which include the commit.Release Notes
N/A
How can this PR be tested?
This is the only occurrence I found using the operator names. With this change, build succeeds with GCC flag
-fno-operator-names.Existing MTR tests and builds will verify there's no regression.
Basing the PR against the correct MariaDB version
PR quality check
Copyright
All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.