summaryrefslogtreecommitdiff
path: root/sql/key.cc
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2019-06-24 19:38:00 +0300
committerEugene Kosov <claprix@yandex.ru>2019-06-25 13:21:36 +0300
commitd36c107a6b7f9e9bc9425072f2ac13afd2334069 (patch)
treef2789ec42ae3419e7633aeb08b5a8a27fd703329 /sql/key.cc
parentd78145459f79d02438e0d57fe8acaff757018c97 (diff)
downloadmariadb-git-d36c107a6b7f9e9bc9425072f2ac13afd2334069.tar.gz
imporve clang build
cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug Maintainer mode makes all warnings errors. This patch fix warnings. Mostly about deprecated `register` keyword. Too much warnings came from Mroonga and I gave up on it.
Diffstat (limited to 'sql/key.cc')
-rw-r--r--sql/key.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/key.cc b/sql/key.cc
index 5a1b3573f6f..9c59bdf020a 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -54,8 +54,8 @@ using std::max;
int find_ref_key(KEY *key, uint key_count, uchar *record, Field *field,
uint *key_length, uint *keypart)
{
- reg2 int i;
- reg3 KEY *key_info;
+ int i;
+ KEY *key_info;
uint fieldpos;
fieldpos= field->offset(record);
@@ -511,7 +511,7 @@ int key_cmp(KEY_PART_INFO *key_part, const uchar *key, uint key_length)
if (key_part->null_bit)
{
/* This key part allows null values; NULL is lower than everything */
- register bool field_is_null= key_part->field->is_null();
+ bool field_is_null= key_part->field->is_null();
if (*key) // If range key is null
{
/* the range is expecting a null value */