mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +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
|
|
@ -642,7 +642,7 @@ uint _mi_rec_pack(MI_INFO *info, register byte *to, register const byte *from)
|
|||
}
|
||||
blob++;
|
||||
}
|
||||
else if (type == FIELD_SKIPP_ZERO)
|
||||
else if (type == FIELD_SKIP_ZERO)
|
||||
{
|
||||
if (memcmp((byte*) from,zero_string,length) == 0)
|
||||
flag|=bit;
|
||||
|
|
@ -651,11 +651,11 @@ uint _mi_rec_pack(MI_INFO *info, register byte *to, register const byte *from)
|
|||
memcpy((byte*) to,from,(size_t) length); to+=length;
|
||||
}
|
||||
}
|
||||
else if (type == FIELD_SKIPP_ENDSPACE ||
|
||||
type == FIELD_SKIPP_PRESPACE)
|
||||
else if (type == FIELD_SKIP_ENDSPACE ||
|
||||
type == FIELD_SKIP_PRESPACE)
|
||||
{
|
||||
pos= (byte*) from; end= (byte*) from + length;
|
||||
if (type == FIELD_SKIPP_ENDSPACE)
|
||||
if (type == FIELD_SKIP_ENDSPACE)
|
||||
{ /* Pack trailing spaces */
|
||||
while (end > from && *(end-1) == ' ')
|
||||
end--;
|
||||
|
|
@ -750,7 +750,7 @@ my_bool _mi_rec_check(MI_INFO *info,const char *record)
|
|||
if (blob_length)
|
||||
to+=length - mi_portable_sizeof_char_ptr+ blob_length;
|
||||
}
|
||||
else if (type == FIELD_SKIPP_ZERO)
|
||||
else if (type == FIELD_SKIP_ZERO)
|
||||
{
|
||||
if (memcmp((byte*) record,zero_string,length) == 0)
|
||||
{
|
||||
|
|
@ -760,11 +760,11 @@ my_bool _mi_rec_check(MI_INFO *info,const char *record)
|
|||
else
|
||||
to+=length;
|
||||
}
|
||||
else if (type == FIELD_SKIPP_ENDSPACE ||
|
||||
type == FIELD_SKIPP_PRESPACE)
|
||||
else if (type == FIELD_SKIP_ENDSPACE ||
|
||||
type == FIELD_SKIP_PRESPACE)
|
||||
{
|
||||
pos= (byte*) record; end= (byte*) record + length;
|
||||
if (type == FIELD_SKIPP_ENDSPACE)
|
||||
if (type == FIELD_SKIP_ENDSPACE)
|
||||
{ /* Pack trailing spaces */
|
||||
while (end > record && *(end-1) == ' ')
|
||||
end--;
|
||||
|
|
@ -876,10 +876,10 @@ ulong _mi_rec_unpack(register MI_INFO *info, register byte *to, byte *from,
|
|||
}
|
||||
if (flag & bit)
|
||||
{
|
||||
if (type == FIELD_BLOB || type == FIELD_SKIPP_ZERO)
|
||||
if (type == FIELD_BLOB || type == FIELD_SKIP_ZERO)
|
||||
bzero((byte*) to,rec_length);
|
||||
else if (type == FIELD_SKIPP_ENDSPACE ||
|
||||
type == FIELD_SKIPP_PRESPACE)
|
||||
else if (type == FIELD_SKIP_ENDSPACE ||
|
||||
type == FIELD_SKIP_PRESPACE)
|
||||
{
|
||||
if (rec->length > 255 && *from & 128)
|
||||
{
|
||||
|
|
@ -897,7 +897,7 @@ ulong _mi_rec_unpack(register MI_INFO *info, register byte *to, byte *from,
|
|||
if (length >= rec_length ||
|
||||
min_pack_length + length > (uint) (from_end - from))
|
||||
goto err;
|
||||
if (type == FIELD_SKIPP_ENDSPACE)
|
||||
if (type == FIELD_SKIP_ENDSPACE)
|
||||
{
|
||||
memcpy(to,(byte*) from,(size_t) length);
|
||||
bfill((byte*) to+length,rec_length-length,' ');
|
||||
|
|
@ -924,7 +924,7 @@ ulong _mi_rec_unpack(register MI_INFO *info, register byte *to, byte *from,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (type == FIELD_SKIPP_ENDSPACE || type == FIELD_SKIPP_PRESPACE)
|
||||
if (type == FIELD_SKIP_ENDSPACE || type == FIELD_SKIP_PRESPACE)
|
||||
min_pack_length--;
|
||||
if (min_pack_length + rec_length > (uint) (from_end - from))
|
||||
goto err;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue