summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/filesort.cc2
-rw-r--r--sql/item_strfunc.cc8
-rw-r--r--sql/mysqld.cc4
-rw-r--r--sql/opt_range.h2
-rw-r--r--sql/sql_delete.cc2
-rw-r--r--sql/sql_select.cc14
-rw-r--r--sql/sql_string.cc12
-rw-r--r--sql/sql_update.cc4
8 files changed, 24 insertions, 24 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index b69aaf44e46..43a99a36287 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -399,7 +399,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
}
if (error == 0)
param->examined_rows++;
- if (error == 0 && (!select || select->skipp_record() == 0))
+ if (error == 0 && (!select || select->skip_record() == 0))
{
if (idx == param->keys)
{
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 5420a8f69e4..f5922d03868 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -780,7 +780,7 @@ redo:
register char *i,*j;
i=(char*) ptr+1; j=(char*) search+1;
while (j != search_end)
- if (*i++ != *j++) goto skipp;
+ if (*i++ != *j++) goto skip;
offset= (int) (ptr-res->ptr());
if (res->length()-from_length + to_length >
current_thd->variables.max_allowed_packet)
@@ -794,7 +794,7 @@ redo:
offset+=(int) to_length;
goto redo;
}
-skipp:
+skip:
if ((l=my_ismbchar(res->charset(), ptr,strend))) ptr+=l;
else ++ptr;
}
@@ -1089,13 +1089,13 @@ String *Item_func_substr_index::val_str(String *str)
register char *i,*j;
i=(char*) ptr+1; j=(char*) search+1;
while (j != search_end)
- if (*i++ != *j++) goto skipp;
+ if (*i++ != *j++) goto skip;
if (pass==0) ++n;
else if (!--c) break;
ptr+=delimeter_length;
continue;
}
- skipp:
+ skip:
if ((l=my_ismbchar(res->charset(), ptr,strend))) ptr+=l;
else ++ptr;
} /* either not found or got total number when count<0 */
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 36c7c9c364c..53cf792a86c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5919,7 +5919,7 @@ static ulong find_bit_type(const char *x, TYPELIB *bit_lib)
{
if (my_toupper(mysqld_charset,*i++) !=
my_toupper(mysqld_charset,*j++))
- goto skipp;
+ goto skip;
}
found_int=bit;
if (! *i)
@@ -5931,7 +5931,7 @@ static ulong find_bit_type(const char *x, TYPELIB *bit_lib)
{
found_count++; // Could be one of two values
}
-skipp: ;
+skip: ;
}
if (found_count != 1)
DBUG_RETURN(~(ulong) 0); // No unique value
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 1c209dc7027..c413b1f4021 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -129,7 +129,7 @@ class SQL_SELECT :public Sql_alloc {
~SQL_SELECT();
bool check_quick(THD *thd, bool force_quick_range, ha_rows limit)
{ return test_quick_select(thd, key_map(~0), 0, limit, force_quick_range) < 0; }
- inline bool skipp_record() { return cond ? cond->val_int() == 0 : 0; }
+ inline bool skip_record() { return cond ? cond->val_int() == 0 : 0; }
int test_quick_select(THD *thd, key_map keys, table_map prev_tables,
ha_rows limit, bool force_quick_range=0);
};
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 9ac7b7596fe..ed9136a6d5b 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -159,7 +159,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order,
!thd->net.report_error)
{
// thd->net.report_error is tested to disallow delete row on error
- if (!(select && select->skipp_record())&& !thd->net.report_error )
+ if (!(select && select->skip_record())&& !thd->net.report_error )
{
if (!(error=table->file->delete_row(table->record[0])))
{
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 015d329cc7f..ad5799f4c42 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -82,7 +82,7 @@ static int do_select(JOIN *join,List<Item> *fields,TABLE *tmp_table,
Procedure *proc);
static int sub_select_cache(JOIN *join,JOIN_TAB *join_tab,bool end_of_records);
static int sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records);
-static int flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skipp_last);
+static int flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last);
static int end_send(JOIN *join, JOIN_TAB *join_tab, bool end_of_records);
static int end_send_group(JOIN *join, JOIN_TAB *join_tab,bool end_of_records);
static int end_write(JOIN *join, JOIN_TAB *join_tab, bool end_of_records);
@@ -5759,14 +5759,14 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
static int
-flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skipp_last)
+flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last)
{
int error;
READ_RECORD *info;
if (!join_tab->cache.records)
return 0; /* Nothing to do */
- if (skipp_last)
+ if (skip_last)
(void) store_record_in_cache(&join_tab->cache); // Must save this for later
if (join_tab->use_quick == 2)
{
@@ -5800,21 +5800,21 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skipp_last)
}
SQL_SELECT *select=join_tab->select;
if (!error && (!join_tab->cache.select ||
- !join_tab->cache.select->skipp_record()))
+ !join_tab->cache.select->skip_record()))
{
uint i;
reset_cache(&join_tab->cache);
- for (i=(join_tab->cache.records- (skipp_last ? 1 : 0)) ; i-- > 0 ;)
+ for (i=(join_tab->cache.records- (skip_last ? 1 : 0)) ; i-- > 0 ;)
{
read_cached_record(join_tab);
- if (!select || !select->skipp_record())
+ if (!select || !select->skip_record())
if ((error=(join_tab->next_select)(join,join_tab+1,0)) < 0)
return error; /* purecov: inspected */
}
}
} while (!(error=info->read_record(info)));
- if (skipp_last)
+ if (skip_last)
read_cached_record(join_tab); // Restore current record
reset_cache(&join_tab->cache);
join_tab->cache.records=0; join_tab->cache.ptr_record= (uint) ~0;
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 42e700b27aa..7f26a0febda 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -521,7 +521,7 @@ int String::strstr(const String &s,uint32 offset)
register const char *search=s.ptr();
const char *end=Ptr+str_length-s.length()+1;
const char *search_end=s.ptr()+s.length();
-skipp:
+skip:
while (str != end)
{
if (*str++ == *search)
@@ -529,7 +529,7 @@ skipp:
register char *i,*j;
i=(char*) str; j=(char*) search+1;
while (j != search_end)
- if (*i++ != *j++) goto skipp;
+ if (*i++ != *j++) goto skip;
return (int) (str-Ptr) -1;
}
}
@@ -553,7 +553,7 @@ int String::strstr_case(const String &s,uint32 offset)
register const char *search=s.ptr();
const char *end=Ptr+str_length-s.length()+1;
const char *search_end=s.ptr()+s.length();
-skipp:
+skip:
while (str != end)
{
if (str_charset->sort_order[*str++] == str_charset->sort_order[*search])
@@ -563,7 +563,7 @@ skipp:
while (j != search_end)
if (str_charset->sort_order[*i++] !=
str_charset->sort_order[*j++])
- goto skipp;
+ goto skip;
return (int) (str-Ptr) -1;
}
}
@@ -586,7 +586,7 @@ int String::strrstr(const String &s,uint32 offset)
const char *end=Ptr+s.length()-2;
const char *search_end=s.ptr()-1;
-skipp:
+skip:
while (str != end)
{
if (*str-- == *search)
@@ -594,7 +594,7 @@ skipp:
register char *i,*j;
i=(char*) str; j=(char*) search-1;
while (j != search_end)
- if (*i-- != *j--) goto skipp;
+ if (*i-- != *j--) goto skip;
return (int) (i-Ptr) +1;
}
}
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 8ee00f2bca6..c6e470fd09f 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -245,7 +245,7 @@ int mysql_update(THD *thd,
while (!(error=info.read_record(&info)) && !thd->killed)
{
- if (!(select && select->skipp_record()))
+ if (!(select && select->skip_record()))
{
table->file->position(table->record[0]);
if (my_b_write(&tempfile,table->file->ref,
@@ -302,7 +302,7 @@ int mysql_update(THD *thd,
while (!(error=info.read_record(&info)) && !thd->killed)
{
- if (!(select && select->skipp_record()))
+ if (!(select && select->skip_record()))
{
store_record(table,record[1]);
if (fill_record(fields,values, 0) || thd->net.report_error)
View Lorry Controller Status