summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 390abe36b6c..edf6c776f68 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -667,8 +667,8 @@ int String::strstr(const String &s,uint32 offset)
if (!s.length())
return ((int) offset); // Empty string is always found
- register const char *str = Ptr+offset;
- register const char *search=s.ptr();
+ const char *str = Ptr+offset;
+ const char *search=s.ptr();
const char *end=Ptr+str_length-s.length()+1;
const char *search_end=s.ptr()+s.length();
skip:
@@ -676,7 +676,7 @@ skip:
{
if (*str++ == *search)
{
- register char *i,*j;
+ char *i,*j;
i=(char*) str; j=(char*) search+1;
while (j != search_end)
if (*i++ != *j++) goto skip;
@@ -697,8 +697,8 @@ int String::strrstr(const String &s,uint32 offset)
{
if (!s.length())
return offset; // Empty string is always found
- register const char *str = Ptr+offset-1;
- register const char *search=s.ptr()+s.length()-1;
+ const char *str = Ptr+offset-1;
+ const char *search=s.ptr()+s.length()-1;
const char *end=Ptr+s.length()-2;
const char *search_end=s.ptr()-1;
@@ -707,7 +707,7 @@ skip:
{
if (*str-- == *search)
{
- register char *i,*j;
+ char *i,*j;
i=(char*) str; j=(char*) search-1;
while (j != search_end)
if (*i-- != *j--) goto skip;