summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-08 10:40:05 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-08 16:22:38 +0300
commit4513de3127df61fa2030690110bb34b7e1c40849 (patch)
treeb8d59284bc82cbbc46799f1a7281b3e258929ab0
parenta536664e80da75c0dc2ef82d5872d5d91d6578ef (diff)
downloadmariadb-git-4513de3127df61fa2030690110bb34b7e1c40849.tar.gz
Remove a "register" keyword from C++ code
The register keyword has no effect in C++, and it has been deprecated in newer versions of the standard.
-rw-r--r--sql/filesort.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 1f0f7c0f577..83edfadee2d 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1514,7 +1514,7 @@ cleanup:
ulong read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
uint rec_length)
{
- register ulong count;
+ ulong count;
ulong length= 0;
if ((count= (ulong) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))