diff options
author | unknown <ram@gw.mysql.r18.ru> | 2004-02-02 20:25:39 +0400 |
---|---|---|
committer | unknown <ram@gw.mysql.r18.ru> | 2004-02-02 20:25:39 +0400 |
commit | f1bfba29d4e61daaafdf60df402dca3f70e2c79d (patch) | |
tree | ae7957062d4d1c4f2256c593e924347d05c66bb6 /myisam | |
parent | f85e469eedc259dcdeb657ceef63b071a2983849 (diff) | |
download | mariadb-git-f1bfba29d4e61daaafdf60df402dca3f70e2c79d.tar.gz |
just tried to find all 'skipp' and replace it with 'skip'.
client/sql_string.cc:
skipp -> skip
dbug/dbug.c:
skipp -> skip
myisam/mi_create.c:
skipp -> skip
myisam/mi_dynrec.c:
skipp -> skip
myisam/mi_packrec.c:
skipp -> skip
myisam/mi_rrnd.c:
skipp -> skip
myisam/mi_test1.c:
skipp -> skip
myisam/myisampack.c:
skipp -> skip
myisam/rt_test.c:
skipp -> skip
myisam/sp_test.c:
skipp -> skip
mysys/default.c:
skipp -> skip
mysys/mf_iocache.c:
skipp -> skip
mysys/mf_pack.c:
skipp -> skip
mysys/mf_wcomp.c:
skipp -> skip
mysys/typelib.c:
skipp -> skip
sql/filesort.cc:
skipp -> skip
sql/item_strfunc.cc:
skipp -> skip
sql/mysqld.cc:
skipp -> skip
sql/opt_range.h:
skipp -> skip
sql/sql_delete.cc:
skipp -> skip
sql/sql_select.cc:
skipp -> skip
sql/sql_string.cc:
skipp -> skip
sql/sql_update.cc:
skipp -> skip
strings/ctype-bin.c:
skipp -> skip
strings/ctype-simple.c:
skipp -> skip
strings/r_strinstr.c:
skipp -> skip
strings/strinstr.c:
skipp -> skip
strings/strstr.c:
skipp -> skip
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/mi_create.c | 18 | ||||
-rw-r--r-- | myisam/mi_dynrec.c | 10 | ||||
-rw-r--r-- | myisam/mi_packrec.c | 18 | ||||
-rw-r--r-- | myisam/mi_rrnd.c | 8 | ||||
-rw-r--r-- | myisam/mi_statrec.c | 6 | ||||
-rw-r--r-- | myisam/mi_test1.c | 2 | ||||
-rw-r--r-- | myisam/myisampack.c | 8 | ||||
-rw-r--r-- | myisam/rt_test.c | 2 | ||||
-rw-r--r-- | myisam/sp_test.c | 2 |
9 files changed, 37 insertions, 37 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c index 9036ced751c..72633966b54 100644 --- a/myisam/mi_create.c +++ b/myisam/mi_create.c @@ -42,7 +42,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, int errpos,save_errno; myf create_flag; uint fields,length,max_key_length,packed,pointer, - key_length,info_length,key_segs,options,min_key_length_skipp, + key_length,info_length,key_segs,options,min_key_length_skip, base_pos,varchar_count,long_varchar_count,varchar_length, max_key_block_length,unique_key_parts,fulltext_keys,offset; ulong reclength, real_reclength,min_pack_length; @@ -238,7 +238,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, { share.state.key_root[i]= HA_OFFSET_ERROR; - min_key_length_skipp=length=0; + min_key_length_skip=length=0; key_length=pointer; if (keydef->flag & HA_SPATIAL) { @@ -269,7 +269,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, keydef->keysegs+=sp_segs; key_length+=SPLEN*sp_segs; length++; /* At least one length byte */ - min_key_length_skipp+=SPLEN*2*SPDIMS; + min_key_length_skip+=SPLEN*2*SPDIMS; } else if (keydef->flag & HA_FULLTEXT) @@ -291,7 +291,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, fulltext_keys++; key_length+= HA_FT_MAXBYTELEN+HA_FT_WLEN; length++; /* At least one length byte */ - min_key_length_skipp+=HA_FT_MAXBYTELEN; + min_key_length_skip+=HA_FT_MAXBYTELEN; } else { @@ -348,10 +348,10 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, keydef->flag |= HA_SPACE_PACK_USED | HA_VAR_LENGTH_KEY; options|=HA_OPTION_PACK_KEYS; /* Using packed keys */ length++; /* At least one length byte */ - min_key_length_skipp+=keyseg->length; + min_key_length_skip+=keyseg->length; if (keyseg->length >= 255) { /* prefix may be 3 bytes */ - min_key_length_skipp+=2; + min_key_length_skip+=2; length+=2; } } @@ -360,10 +360,10 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, keydef->flag|=HA_VAR_LENGTH_KEY; length++; /* At least one length byte */ options|=HA_OPTION_PACK_KEYS; /* Using packed keys */ - min_key_length_skipp+=keyseg->length; + min_key_length_skip+=keyseg->length; if (keyseg->length >= 255) { /* prefix may be 3 bytes */ - min_key_length_skipp+=2; + min_key_length_skip+=2; length+=2; } } @@ -395,7 +395,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, } set_if_bigger(max_key_block_length,keydef->block_length); keydef->keylength= (uint16) key_length; - keydef->minlength= (uint16) (length-min_key_length_skipp); + keydef->minlength= (uint16) (length-min_key_length_skip); keydef->maxlength= (uint16) length; if (length > max_key_length) diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index e1bfe4c3ac5..079779bd0ef 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -1248,7 +1248,7 @@ err: int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, register my_off_t filepos, - my_bool skipp_deleted_blocks) + my_bool skip_deleted_blocks) { int flag,info_read,save_errno; uint left_len,b_type; @@ -1299,7 +1299,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, { if (_mi_read_cache(&info->rec_cache,(byte*) block_info.header,filepos, sizeof(block_info.header), - (!flag && skipp_deleted_blocks ? READING_NEXT : 0) | + (!flag && skip_deleted_blocks ? READING_NEXT : 0) | READING_HEADER)) goto panic; b_type=_mi_get_block_info(&block_info,-1,filepos); @@ -1318,7 +1318,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, BLOCK_FATAL_ERROR)) { if ((b_type & (BLOCK_DELETED | BLOCK_SYNC_ERROR)) - && skipp_deleted_blocks) + && skip_deleted_blocks) { filepos=block_info.filepos+block_info.block_len; block_info.second_read=0; @@ -1374,7 +1374,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, { if (_mi_read_cache(&info->rec_cache,(byte*) to,filepos, block_info.data_len, - (!flag && skipp_deleted_blocks) ? READING_NEXT :0)) + (!flag && skip_deleted_blocks) ? READING_NEXT :0)) goto panic; } else @@ -1391,7 +1391,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, if (flag++ == 0) { info->nextpos=block_info.filepos+block_info.block_len; - skipp_deleted_blocks=0; + skip_deleted_blocks=0; } left_len-=block_info.data_len; to+=block_info.data_len; diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index b21bf0b2163..94eb2de17e2 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -32,7 +32,7 @@ (BU)->current_byte & ((mi_bit_type) 1 << --(BU)->bits) :\ (fill_buffer(BU), (BU)->bits= BITS_SAVED-1,\ (BU)->current_byte & ((mi_bit_type) 1 << (BITS_SAVED-1)))) -#define skipp_to_next_byte(BU) ((BU)->bits&=~7) +#define skip_to_next_byte(BU) ((BU)->bits&=~7) #define get_bits(BU,count) (((BU)->bits >= count) ? (((BU)->current_byte >> ((BU)->bits-=count)) & mask[count]) : fill_and_get_bits(BU,count)) #define decode_bytes_test_bit(bit) \ @@ -58,9 +58,9 @@ static void (*get_unpack_function(MI_COLUMNDEF *rec))(MI_COLUMNDEF *field, MI_BIT_BUFF *buff, uchar *to, uchar *end); -static void uf_zerofill_skipp_zero(MI_COLUMNDEF *rec,MI_BIT_BUFF *bit_buff, +static void uf_zerofill_skip_zero(MI_COLUMNDEF *rec,MI_BIT_BUFF *bit_buff, uchar *to,uchar *end); -static void uf_skipp_zero(MI_COLUMNDEF *rec,MI_BIT_BUFF *bit_buff, +static void uf_skip_zero(MI_COLUMNDEF *rec,MI_BIT_BUFF *bit_buff, uchar *to,uchar *end); static void uf_space_normal(MI_COLUMNDEF *rec,MI_BIT_BUFF *bit_buff, uchar *to,uchar *end); @@ -210,7 +210,7 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys) huff_tree_bits); share->rec[i].unpack=get_unpack_function(share->rec+i); } - skipp_to_next_byte(&bit_buff); + skip_to_next_byte(&bit_buff); decode_table=share->decode_tables; for (i=0 ; i < trees ; i++) read_huff_table(&bit_buff,share->decode_trees+i,&decode_table, @@ -291,7 +291,7 @@ static void read_huff_table(MI_BIT_BUFF *bit_buff, MI_DECODE_TREE *decode_tree, else *ptr= (uint16) (IS_CHAR + (get_bits(bit_buff,char_bits) + min_chr)); } - skipp_to_next_byte(bit_buff); + skip_to_next_byte(bit_buff); decode_tree->table= *decode_table; decode_tree->intervalls= *intervall_buff; @@ -468,8 +468,8 @@ static void (*get_unpack_function(MI_COLUMNDEF *rec)) switch (rec->base_type) { case FIELD_SKIP_ZERO: if (rec->pack_type & PACK_TYPE_ZERO_FILL) - return &uf_zerofill_skipp_zero; - return &uf_skipp_zero; + return &uf_zerofill_skip_zero; + return &uf_skip_zero; case FIELD_NORMAL: if (rec->pack_type & PACK_TYPE_SPACE_FIELDS) return &uf_space_normal; @@ -515,7 +515,7 @@ static void (*get_unpack_function(MI_COLUMNDEF *rec)) /* De different functions to unpack a field */ -static void uf_zerofill_skipp_zero(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, +static void uf_zerofill_skip_zero(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, uchar *to, uchar *end) { if (get_bit(bit_buff)) @@ -528,7 +528,7 @@ static void uf_zerofill_skipp_zero(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, } } -static void uf_skipp_zero(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, uchar *to, +static void uf_skip_zero(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, uchar *to, uchar *end) { if (get_bit(bit_buff)) diff --git a/myisam/mi_rrnd.c b/myisam/mi_rrnd.c index 29f686b0456..f6a2f021662 100644 --- a/myisam/mi_rrnd.c +++ b/myisam/mi_rrnd.c @@ -32,14 +32,14 @@ int mi_rrnd(MI_INFO *info, byte *buf, register my_off_t filepos) { - my_bool skipp_deleted_blocks; + my_bool skip_deleted_blocks; DBUG_ENTER("mi_rrnd"); - skipp_deleted_blocks=0; + skip_deleted_blocks=0; if (filepos == HA_OFFSET_ERROR) { - skipp_deleted_blocks=1; + skip_deleted_blocks=1; if (info->lastpos == HA_OFFSET_ERROR) /* First read ? */ filepos= info->s->pack.header_length; /* Read first record */ else @@ -56,5 +56,5 @@ int mi_rrnd(MI_INFO *info, byte *buf, register my_off_t filepos) if (info->opt_flag & WRITE_CACHE_USED && flush_io_cache(&info->rec_cache)) DBUG_RETURN(my_errno); - DBUG_RETURN ((*info->s->read_rnd)(info,buf,filepos,skipp_deleted_blocks)); + DBUG_RETURN ((*info->s->read_rnd)(info,buf,filepos,skip_deleted_blocks)); } diff --git a/myisam/mi_statrec.c b/myisam/mi_statrec.c index 9afebce2ae6..8f5cde45e24 100644 --- a/myisam/mi_statrec.c +++ b/myisam/mi_statrec.c @@ -202,7 +202,7 @@ int _mi_read_static_record(register MI_INFO *info, register my_off_t pos, int _mi_read_rnd_static_record(MI_INFO *info, byte *buf, register my_off_t filepos, - my_bool skipp_deleted_blocks) + my_bool skip_deleted_blocks) { int locked,error,cache_read; uint cache_length; @@ -212,13 +212,13 @@ int _mi_read_rnd_static_record(MI_INFO *info, byte *buf, cache_read=0; cache_length=0; if (info->opt_flag & WRITE_CACHE_USED && - (info->rec_cache.pos_in_file <= filepos || skipp_deleted_blocks) && + (info->rec_cache.pos_in_file <= filepos || skip_deleted_blocks) && flush_io_cache(&info->rec_cache)) DBUG_RETURN(my_errno); if (info->opt_flag & READ_CACHE_USED) { /* Cache in use */ if (filepos == my_b_tell(&info->rec_cache) && - (skipp_deleted_blocks || !filepos)) + (skip_deleted_blocks || !filepos)) { cache_read=1; /* Read record using cache */ cache_length=(uint) (info->rec_cache.read_end - info->rec_cache.read_pos); diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c index 64ffbe2db1d..77c4d3dfbad 100644 --- a/myisam/mi_test1.c +++ b/myisam/mi_test1.c @@ -318,7 +318,7 @@ static int run_test(const char *filename) return (0); err: printf("got error: %3d when using myisam-database\n",my_errno); - return 1; /* skipp warning */ + return 1; /* skip warning */ } diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 93edde33bdb..b6d862e38b5 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -1071,7 +1071,7 @@ test_space_compress(HUFF_COUNTS *huff_counts, my_off_t records, { int min_pos; uint length_bits,i; - my_off_t space_count,min_space_count,min_pack,new_length,skipp; + my_off_t space_count,min_space_count,min_pack,new_length,skip; length_bits=max_bit(max_space_length); @@ -1091,15 +1091,15 @@ test_space_compress(HUFF_COUNTS *huff_counts, my_off_t records, min_space_count=space_count; } /* Test with length-flag */ - for (skipp=0L, i=0 ; i < 8 ; i++) + for (skip=0L, i=0 ; i < 8 ; i++) { if (space_counts[i]) { if (i) huff_counts->counts[(uint) ' ']+=space_counts[i]; - skipp+=huff_counts->pre_space[i]; + skip+=huff_counts->pre_space[i]; new_length=calc_packed_length(huff_counts,0)+ - (records+(records-skipp)*(1+length_bits))/8; + (records+(records-skip)*(1+length_bits))/8; if (new_length < min_pack) { min_pos=(int) i; diff --git a/myisam/rt_test.c b/myisam/rt_test.c index 61890bfded1..bbeb8fce2d1 100644 --- a/myisam/rt_test.c +++ b/myisam/rt_test.c @@ -307,7 +307,7 @@ int run_test(const char *filename) err: printf("got error: %3d when using myisam-database\n",my_errno); - return 1; /* skipp warning */ + return 1; /* skip warning */ } diff --git a/myisam/sp_test.c b/myisam/sp_test.c index 16a97771887..5cbf5e87579 100644 --- a/myisam/sp_test.c +++ b/myisam/sp_test.c @@ -283,7 +283,7 @@ int run_test(const char *filename) err: printf("got error: %3d when using myisam-database\n",my_errno); - return 1; /* skipp warning */ + return 1; /* skip warning */ } |