mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 11:15:33 +02:00
Portability fix
Cleanup typos (like SKIPP -> SKIP) BUILD/compile-alpha-cxx: Fix when using InnoDB Docs/manual.texi: FreeBSD note client/mysqlmanager-pwgen.c: Portability fix include/my_base.h: Cleanup typos isam/_dynrec.c: Cleanup typos isam/_packrec.c: Cleanup typos isam/create.c: Cleanup typos isam/pack_isam.c: Cleanup typos isam/test1.c: Cleanup typos isam/test2.c: Cleanup typos libmysql/manager.c: Portability fix myisam/ft_eval.c: Cleanup typos myisam/ft_test1.c: Cleanup typos myisam/mi_create.c: Cleanup typos myisam/mi_dynrec.c: Cleanup typos myisam/mi_packrec.c: Cleanup typos myisam/mi_test1.c: Cleanup typos myisam/mi_test2.c: Cleanup typos myisam/myisampack.c: Cleanup typos sql/field.cc: Cleanup typos sql/field.h: Cleanup typos sql/filesort.cc: Cleanup typos sql/gen_lex_hash.cc: Cleanup typos sql/ha_isam.cc: Cleanup typos sql/ha_myisam.cc: Cleanup typos sql/handler.h: Cleanup typos sql/hash_filo.h: Cleanup typos sql/item.h: Cleanup typos sql/item_cmpfunc.cc: Cleanup typos sql/item_strfunc.cc: Cleanup typos sql/key.cc: Cleanup typos sql/mysqld.cc: Cleanup typos sql/opt_range.cc: Cleanup typos sql/opt_sum.cc: Cleanup typos sql/sql_acl.cc: Cleanup typos sql/sql_class.h: Cleanup typos sql/sql_insert.cc: Cleanup typos sql/sql_lex.cc: Cleanup typos sql/sql_list.h: Cleanup typos sql/sql_load.cc: Cleanup typos sql/sql_parse.cc: Cleanup typos sql/sql_rename.cc: Cleanup typos sql/sql_select.cc: Cleanup typos sql/sql_string.cc: Cleanup typos sql/sql_yacc.yy: Fix bug in last changeset sql/structs.h: Cleanup typos sql/table.cc: Cleanup typos sql/time.cc: Cleanup typos sql/unireg.h: Cleanup typos
This commit is contained in:
parent
9f29fd68bd
commit
8547d05ccc
49 changed files with 187 additions and 169 deletions
|
|
@ -231,7 +231,7 @@ String *Item_func_concat_ws::val_str(String *str)
|
|||
for (i++; i < arg_count ; i++)
|
||||
{
|
||||
if (!(res2= args[i]->val_str(use_as_buff)) || !res2->length())
|
||||
continue; // Skipp NULL and empty string
|
||||
continue; // Skip NULL and empty string
|
||||
|
||||
if (res->length() + sep_str->length() + res2->length() >
|
||||
max_allowed_packet)
|
||||
|
|
@ -520,7 +520,7 @@ String *Item_func_insert::val_str(String *str)
|
|||
}
|
||||
#endif
|
||||
if (start > res->length()+1)
|
||||
return res; // Wrong param; skipp insert
|
||||
return res; // Wrong param; skip insert
|
||||
if (length > res->length()-start)
|
||||
length=res->length()-start;
|
||||
if (res->length() - length + res2->length() > max_allowed_packet)
|
||||
|
|
@ -1097,7 +1097,7 @@ void Item_func_soundex::fix_length_and_dec()
|
|||
|
||||
/*
|
||||
If alpha, map input letter to soundex code.
|
||||
If not alpha and remove_garbage is set then skipp to next char
|
||||
If not alpha and remove_garbage is set then skip to next char
|
||||
else return 0
|
||||
*/
|
||||
|
||||
|
|
@ -1129,7 +1129,7 @@ String *Item_func_soundex::val_str(String *str)
|
|||
char *to= (char *) str_value.ptr();
|
||||
char *from= (char *) res->ptr(), *end=from+res->length();
|
||||
|
||||
while (from != end && isspace(*from)) // Skipp pre-space
|
||||
while (from != end && isspace(*from)) // Skip pre-space
|
||||
from++; /* purecov: inspected */
|
||||
if (from == end)
|
||||
return &empty_string; // No alpha characters.
|
||||
|
|
@ -1304,7 +1304,7 @@ String *Item_func_make_set::val_str(String *str)
|
|||
if (bits & 1)
|
||||
{
|
||||
String *res= (*ptr)->val_str(str);
|
||||
if (res) // Skipp nulls
|
||||
if (res) // Skip nulls
|
||||
{
|
||||
if (!first_found)
|
||||
{ // First argument
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue