summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-07-01 09:48:36 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-07-01 09:48:36 +0300
commit045771c05099cf75fea036fdc89308eb3c06549a (patch)
tree181142185d3a7a612ab0ad238c938ae1e6111131 /sql/field.cc
parent6dc1bc3a5822007cdb2d5b79f0a37b4d6b9b65c7 (diff)
downloadmariadb-git-045771c05099cf75fea036fdc89308eb3c06549a.tar.gz
Fix most clang-15 -Wunused-but-set-variable
Also, refactor trx_i_s_common_fill_table() to remove dead code. Warnings about yynerrs in Bison-generated yyparse() will remain for now.
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 57cf3deed35..3878d261f94 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2017, Oracle and/or its affiliates.
- Copyright (c) 2008, 2021, MariaDB
+ Copyright (c) 2008, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -9990,7 +9990,7 @@ int Field_bit::cmp_prefix(const uchar *a, const uchar *b, size_t prefix_len)
}
-int Field_bit::key_cmp(const uchar *str, uint length)
+int Field_bit::key_cmp(const uchar *str, uint)
{
if (bit_len)
{
@@ -9999,7 +9999,6 @@ int Field_bit::key_cmp(const uchar *str, uint length)
if ((flag= (int) (bits - *str)))
return flag;
str++;
- length--;
}
return memcmp(ptr, str, bytes_in_rec);
}