Fix skipp -> skip once and for all.
(Note: This affects only comments, not variable names.)
This commit is contained in:
parent
deaa73fe42
commit
2f0ca1ce42
@ -197,7 +197,7 @@ int main(int argc,char *argv[])
|
|||||||
for (code=1 ; code < sys_nerr ; code++)
|
for (code=1 ; code < sys_nerr ; code++)
|
||||||
{
|
{
|
||||||
if (sys_errlist[code][0])
|
if (sys_errlist[code][0])
|
||||||
{ /* Skipp if no error-text */
|
{ /* Skip if no error-text */
|
||||||
printf("%3d = %s\n",code,sys_errlist[code]);
|
printf("%3d = %s\n",code,sys_errlist[code]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -236,7 +236,7 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key)
|
|||||||
key+=seg->length;
|
key+=seg->length;
|
||||||
if (seg->null_bit)
|
if (seg->null_bit)
|
||||||
{
|
{
|
||||||
key++; /* Skipp null byte */
|
key++; /* Skip null byte */
|
||||||
if (*pos) /* Found null */
|
if (*pos) /* Found null */
|
||||||
{
|
{
|
||||||
nr^= (nr << 1) | 1;
|
nr^= (nr << 1) | 1;
|
||||||
|
@ -430,7 +430,7 @@ uint _nisam_rec_pack(N_INFO *info, register byte *to, register const byte *from)
|
|||||||
to+=length+blob->length;
|
to+=length+blob->length;
|
||||||
}
|
}
|
||||||
blob++;
|
blob++;
|
||||||
from+=sizeof(char*); /* Skipp blob-pointer */
|
from+=sizeof(char*); /* Skip blob-pointer */
|
||||||
}
|
}
|
||||||
else if (type == FIELD_SKIP_ZERO)
|
else if (type == FIELD_SKIP_ZERO)
|
||||||
{
|
{
|
||||||
@ -633,7 +633,7 @@ uint _nisam_rec_unpack(register N_INFO *info, register byte *to, byte *from,
|
|||||||
if ((type = (enum en_fieldtype) rec->base.type) != FIELD_NORMAL)
|
if ((type = (enum en_fieldtype) rec->base.type) != FIELD_NORMAL)
|
||||||
{
|
{
|
||||||
if (type == FIELD_ZERO)
|
if (type == FIELD_ZERO)
|
||||||
continue; /* Skipp this */
|
continue; /* Skip this */
|
||||||
if (flag & bit)
|
if (flag & bit)
|
||||||
{
|
{
|
||||||
if (type == FIELD_BLOB)
|
if (type == FIELD_BLOB)
|
||||||
@ -747,7 +747,7 @@ uint _calc_blob_length(uint length, const byte *pos)
|
|||||||
return (uint) (unsigned short) j;
|
return (uint) (unsigned short) j;
|
||||||
}
|
}
|
||||||
#ifdef MSDOS
|
#ifdef MSDOS
|
||||||
break; /* skipp microsoft warning */
|
break; /* skip microsoft warning */
|
||||||
#endif
|
#endif
|
||||||
case 3:
|
case 3:
|
||||||
return uint3korr(pos);
|
return uint3korr(pos);
|
||||||
|
@ -858,7 +858,7 @@ static int chk_size(register N_INFO *info)
|
|||||||
#endif
|
#endif
|
||||||
if (skr != size)
|
if (skr != size)
|
||||||
{
|
{
|
||||||
info->s->state.data_file_length=(ulong) size; /* Skipp other errors */
|
info->s->state.data_file_length=(ulong) size; /* Skip other errors */
|
||||||
if (skr > size && skr != size + MEMMAP_EXTRA_MARGIN)
|
if (skr > size && skr != size + MEMMAP_EXTRA_MARGIN)
|
||||||
{
|
{
|
||||||
error=1;
|
error=1;
|
||||||
@ -2672,7 +2672,7 @@ static int sort_get_next_record()
|
|||||||
goto try_next;
|
goto try_next;
|
||||||
block_info.second_read=0;
|
block_info.second_read=0;
|
||||||
searching=1;
|
searching=1;
|
||||||
for (i=1 ; i < 11 ; i++) /* Skipp from read string */
|
for (i=1 ; i < 11 ; i++) /* Skip from read string */
|
||||||
if (block_info.header[i] >= 1 && block_info.header[i] <= 16)
|
if (block_info.header[i] >= 1 && block_info.header[i] <= 16)
|
||||||
break;
|
break;
|
||||||
pos+=(ulong) i;
|
pos+=(ulong) i;
|
||||||
|
@ -144,7 +144,7 @@ static void get_options(register int *argc, register char ***argv)
|
|||||||
switch((option=*pos)) {
|
switch((option=*pos)) {
|
||||||
case '#':
|
case '#':
|
||||||
DBUG_PUSH (++pos);
|
DBUG_PUSH (++pos);
|
||||||
pos=" "; /* Skipp rest of arg */
|
pos=" "; /* Skip rest of arg */
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
if (! *++pos)
|
if (! *++pos)
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include <io.h>
|
#include <io.h>
|
||||||
#endif
|
#endif
|
||||||
#ifndef __GNU_LIBRARY__
|
#ifndef __GNU_LIBRARY__
|
||||||
#define __GNU_LIBRARY__ /* Skipp warnings in getopt.h */
|
#define __GNU_LIBRARY__ /* Skip warnings in getopt.h */
|
||||||
#endif
|
#endif
|
||||||
#include <my_getopt.h>
|
#include <my_getopt.h>
|
||||||
|
|
||||||
|
@ -136,7 +136,7 @@ int main(int argc, char *argv[])
|
|||||||
err:
|
err:
|
||||||
printf("got error: %3d when using nisam-database\n",my_errno);
|
printf("got error: %3d when using nisam-database\n",my_errno);
|
||||||
exit(1);
|
exit(1);
|
||||||
return 0; /* skipp warning */
|
return 0; /* skip warning */
|
||||||
} /* main */
|
} /* main */
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ int handle_locking)
|
|||||||
{
|
{
|
||||||
if ((end=buff+length)[-1] == '\n')
|
if ((end=buff+length)[-1] == '\n')
|
||||||
end[-1]='\0';
|
end[-1]='\0';
|
||||||
if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */
|
if (buff[0] && buff[0] != '#') /* Skip empty lines and comments */
|
||||||
{
|
{
|
||||||
last_isam=isam;
|
last_isam=isam;
|
||||||
if (!test_if_hard_path(buff))
|
if (!test_if_hard_path(buff))
|
||||||
|
@ -307,7 +307,7 @@ int chk_size(MI_CHECK *param, register MI_INFO *info)
|
|||||||
#endif
|
#endif
|
||||||
if (skr != size)
|
if (skr != size)
|
||||||
{
|
{
|
||||||
info->state->data_file_length=size; /* Skipp other errors */
|
info->state->data_file_length=size; /* Skip other errors */
|
||||||
if (skr > size && skr != size + MEMMAP_EXTRA_MARGIN)
|
if (skr > size && skr != size + MEMMAP_EXTRA_MARGIN)
|
||||||
{
|
{
|
||||||
error=1;
|
error=1;
|
||||||
@ -3672,7 +3672,7 @@ int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename)
|
|||||||
if (param->language)
|
if (param->language)
|
||||||
keyseg->language=param->language; /* change language */
|
keyseg->language=param->language; /* change language */
|
||||||
}
|
}
|
||||||
keyseg++; /* Skipp end pointer */
|
keyseg++; /* Skip end pointer */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy the unique definitions and change them to point at the new key
|
/* Copy the unique definitions and change them to point at the new key
|
||||||
|
@ -816,7 +816,7 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag,
|
|||||||
if (!(*start & 128))
|
if (!(*start & 128))
|
||||||
prev_length=0; /* prev key not packed */
|
prev_length=0; /* prev key not packed */
|
||||||
if (keyinfo->seg[0].flag & HA_NULL_PART)
|
if (keyinfo->seg[0].flag & HA_NULL_PART)
|
||||||
lastkey++; /* Skipp null marker */
|
lastkey++; /* Skip null marker */
|
||||||
get_key_length(lastkey_length,lastkey);
|
get_key_length(lastkey_length,lastkey);
|
||||||
if (!next_length) /* Same key after */
|
if (!next_length) /* Same key after */
|
||||||
{
|
{
|
||||||
|
@ -221,7 +221,7 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
|
|||||||
k_length-= 2+length;
|
k_length-= 2+length;
|
||||||
set_if_smaller(length,tmp_length); /* Safety */
|
set_if_smaller(length,tmp_length); /* Safety */
|
||||||
store_key_length_inc(key,length);
|
store_key_length_inc(key,length);
|
||||||
old+=2; /* Skipp length */
|
old+=2; /* Skip length */
|
||||||
memcpy((byte*) key, pos+2,(size_t) length);
|
memcpy((byte*) key, pos+2,(size_t) length);
|
||||||
key+= length;
|
key+= length;
|
||||||
continue;
|
continue;
|
||||||
|
@ -761,7 +761,7 @@ uint _mi_get_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
|
|||||||
}
|
}
|
||||||
if (keyseg->flag & HA_NULL_PART)
|
if (keyseg->flag & HA_NULL_PART)
|
||||||
{
|
{
|
||||||
key++; /* Skipp null marker*/
|
key++; /* Skip null marker*/
|
||||||
start++;
|
start++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1395,7 +1395,7 @@ _mi_calc_var_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key,
|
|||||||
if (prev_key && !*prev_key++)
|
if (prev_key && !*prev_key++)
|
||||||
org_key=prev_key=0; /* Can't pack against prev */
|
org_key=prev_key=0; /* Can't pack against prev */
|
||||||
else if (org_key)
|
else if (org_key)
|
||||||
org_key++; /* Skipp NULL */
|
org_key++; /* Skip NULL */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
s_temp->store_not_null=0;
|
s_temp->store_not_null=0;
|
||||||
|
@ -145,7 +145,7 @@ static void get_options(register int *argc, register char ***argv)
|
|||||||
switch((option=*pos)) {
|
switch((option=*pos)) {
|
||||||
case '#':
|
case '#':
|
||||||
DBUG_PUSH (++pos);
|
DBUG_PUSH (++pos);
|
||||||
pos=" "; /* Skipp rest of arg */
|
pos=" "; /* Skip rest of arg */
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
if (! *++pos)
|
if (! *++pos)
|
||||||
|
@ -91,7 +91,7 @@ Tue Mar 26 15:09:45 1991 Mikael WIDENIUS (monty at panther)
|
|||||||
|
|
||||||
Sat Mar 23 10:49:49 1991 Michael Widenius (monty at LYNX)
|
Sat Mar 23 10:49:49 1991 Michael Widenius (monty at LYNX)
|
||||||
|
|
||||||
* Added init of alarm variables to skipp some warnings from gcc.
|
* Added init of alarm variables to skip some warnings from gcc.
|
||||||
|
|
||||||
Tue Mar 5 16:50:34 1991 Michael Widenius (monty at LYNX)
|
Tue Mar 5 16:50:34 1991 Michael Widenius (monty at LYNX)
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ Mon Aug 27 22:20:38 1990 Michael Widenius (monty at lynx)
|
|||||||
Sun Apr 1 23:29:47 1990 Monty (monty at monty)
|
Sun Apr 1 23:29:47 1990 Monty (monty at monty)
|
||||||
|
|
||||||
* Changed mf_keydisk.c to have separate functions for read and write.
|
* Changed mf_keydisk.c to have separate functions for read and write.
|
||||||
Read can now return pointer to intern key-buffer to skipp
|
Read can now return pointer to intern key-buffer to skip
|
||||||
unessessary memcpy-s.
|
unessessary memcpy-s.
|
||||||
|
|
||||||
Fri Mar 23 23:03:39 1990 Monty (monty at monty)
|
Fri Mar 23 23:03:39 1990 Monty (monty at monty)
|
||||||
|
@ -222,7 +222,7 @@ int load_defaults(const char *conf_file, const char **groups,
|
|||||||
/* copy name + found arguments + command line arguments to new array */
|
/* copy name + found arguments + command line arguments to new array */
|
||||||
res[0]= argv[0][0]; /* Name MUST be set, even by embedded library */
|
res[0]= argv[0][0]; /* Name MUST be set, even by embedded library */
|
||||||
memcpy((gptr) (res+1), args.buffer, args.elements*sizeof(char*));
|
memcpy((gptr) (res+1), args.buffer, args.elements*sizeof(char*));
|
||||||
/* Skipp --defaults-file and --defaults-extra-file */
|
/* Skip --defaults-file and --defaults-extra-file */
|
||||||
(*argc)-= args_used;
|
(*argc)-= args_used;
|
||||||
(*argv)+= args_used;
|
(*argv)+= args_used;
|
||||||
|
|
||||||
|
@ -800,7 +800,7 @@ int _my_b_async_read(register IO_CACHE *info, byte *Buffer, uint Count)
|
|||||||
{ /* Fix if skipped bytes */
|
{ /* Fix if skipped bytes */
|
||||||
if (info->aio_read_pos + read_length < info->pos_in_file)
|
if (info->aio_read_pos + read_length < info->pos_in_file)
|
||||||
{
|
{
|
||||||
read_length=0; /* Skipp block */
|
read_length=0; /* Skip block */
|
||||||
next_pos_in_file=info->pos_in_file;
|
next_pos_in_file=info->pos_in_file;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -894,7 +894,7 @@ int _my_b_async_read(register IO_CACHE *info, byte *Buffer, uint Count)
|
|||||||
if (aioread(info->file,read_buffer,(int) max_length,
|
if (aioread(info->file,read_buffer,(int) max_length,
|
||||||
(my_off_t) next_pos_in_file,MY_SEEK_SET,
|
(my_off_t) next_pos_in_file,MY_SEEK_SET,
|
||||||
&info->aio_result.result))
|
&info->aio_result.result))
|
||||||
{ /* Skipp async io */
|
{ /* Skip async io */
|
||||||
my_errno=errno;
|
my_errno=errno;
|
||||||
DBUG_PRINT("error",("got error: %d, aio_result: %d from aioread, async skipped",
|
DBUG_PRINT("error",("got error: %d, aio_result: %d from aioread, async skipped",
|
||||||
errno, info->aio_result.result.aio_errno));
|
errno, info->aio_result.result.aio_errno));
|
||||||
|
@ -266,7 +266,7 @@ uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args)
|
|||||||
fmt++;
|
fmt++;
|
||||||
/* Found one '%' */
|
/* Found one '%' */
|
||||||
}
|
}
|
||||||
/* Skipp if max size is used (to be compatible with printf) */
|
/* Skip if max size is used (to be compatible with printf) */
|
||||||
while (my_isdigit(&my_charset_latin1, *fmt) || *fmt == '.' || *fmt == '-')
|
while (my_isdigit(&my_charset_latin1, *fmt) || *fmt == '.' || *fmt == '-')
|
||||||
fmt++;
|
fmt++;
|
||||||
if (*fmt == 's') /* String parameter */
|
if (*fmt == 's') /* String parameter */
|
||||||
|
@ -43,7 +43,7 @@ void pack_dirname(my_string to, const char *from)
|
|||||||
(void) intern_filename(to,from); /* Change to intern name */
|
(void) intern_filename(to,from); /* Change to intern name */
|
||||||
|
|
||||||
#ifdef FN_DEVCHAR
|
#ifdef FN_DEVCHAR
|
||||||
if ((start=strrchr(to,FN_DEVCHAR)) != 0) /* Skipp device part */
|
if ((start=strrchr(to,FN_DEVCHAR)) != 0) /* Skip device part */
|
||||||
start++;
|
start++;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@ -131,7 +131,7 @@ uint cleanup_dirname(register my_string to, const char *from)
|
|||||||
from_ptr=(my_string) from;
|
from_ptr=(my_string) from;
|
||||||
#ifdef FN_DEVCHAR
|
#ifdef FN_DEVCHAR
|
||||||
if ((pos=strrchr(from_ptr,FN_DEVCHAR)) != 0)
|
if ((pos=strrchr(from_ptr,FN_DEVCHAR)) != 0)
|
||||||
{ /* Skipp device part */
|
{ /* Skip device part */
|
||||||
length=(uint) (pos-from_ptr)+1;
|
length=(uint) (pos-from_ptr)+1;
|
||||||
start=strnmov(buff,from_ptr,length); from_ptr+=length;
|
start=strnmov(buff,from_ptr,length); from_ptr+=length;
|
||||||
}
|
}
|
||||||
@ -195,7 +195,7 @@ uint cleanup_dirname(register my_string to, const char *from)
|
|||||||
pos--; /* Remove dupplicate '/' */
|
pos--; /* Remove dupplicate '/' */
|
||||||
}
|
}
|
||||||
else if (pos-start > 1 && pos[-1] == FN_CURLIB && pos[-2] == FN_LIBCHAR)
|
else if (pos-start > 1 && pos[-1] == FN_CURLIB && pos[-2] == FN_LIBCHAR)
|
||||||
pos-=2; /* Skipp /./ */
|
pos-=2; /* Skip /./ */
|
||||||
else if (pos > buff+1 && pos[-1] == FN_HOMELIB && pos[-2] == FN_LIBCHAR)
|
else if (pos > buff+1 && pos[-1] == FN_HOMELIB && pos[-2] == FN_LIBCHAR)
|
||||||
{ /* Found ..../~/ */
|
{ /* Found ..../~/ */
|
||||||
buff[0]=FN_HOMELIB;
|
buff[0]=FN_HOMELIB;
|
||||||
@ -409,7 +409,7 @@ uint system_filename(my_string to, const char *from)
|
|||||||
libchar_found=0;
|
libchar_found=0;
|
||||||
(void) strmov(buff,from); /* If to == from */
|
(void) strmov(buff,from); /* If to == from */
|
||||||
from_pos= buff;
|
from_pos= buff;
|
||||||
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skipp device part */
|
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skip device part */
|
||||||
{
|
{
|
||||||
pos++;
|
pos++;
|
||||||
to_pos=strnmov(to,from_pos,(size_s) (pos-from_pos));
|
to_pos=strnmov(to,from_pos,(size_s) (pos-from_pos));
|
||||||
@ -419,7 +419,7 @@ uint system_filename(my_string to, const char *from)
|
|||||||
to_pos=to;
|
to_pos=to;
|
||||||
|
|
||||||
if (from_pos[0] == FN_CURLIB && from_pos[1] == FN_LIBCHAR)
|
if (from_pos[0] == FN_CURLIB && from_pos[1] == FN_LIBCHAR)
|
||||||
from_pos+=2; /* Skipp './' */
|
from_pos+=2; /* Skip './' */
|
||||||
if (strchr(from_pos,FN_LIBCHAR))
|
if (strchr(from_pos,FN_LIBCHAR))
|
||||||
{
|
{
|
||||||
*(to_pos++) = FN_C_BEFORE_DIR;
|
*(to_pos++) = FN_C_BEFORE_DIR;
|
||||||
@ -487,7 +487,7 @@ my_string intern_filename(my_string to, const char *from)
|
|||||||
|
|
||||||
convert_dirname(buff,from,NullS); /* change '<>' to '[]' */
|
convert_dirname(buff,from,NullS); /* change '<>' to '[]' */
|
||||||
from_pos=buff;
|
from_pos=buff;
|
||||||
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skipp device part */
|
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skip device part */
|
||||||
{
|
{
|
||||||
pos++;
|
pos++;
|
||||||
to_pos=strnmov(to,from_pos,(size_s) (pos-from_pos));
|
to_pos=strnmov(to,from_pos,(size_s) (pos-from_pos));
|
||||||
|
@ -52,7 +52,7 @@ void soundex(CHARSET_INFO * cs,register my_string out_pntr, my_string in_pntr,
|
|||||||
|
|
||||||
if (remove_garbage)
|
if (remove_garbage)
|
||||||
{
|
{
|
||||||
while (*in_pntr && !my_isalpha(cs,*in_pntr)) /* Skipp pre-space */
|
while (*in_pntr && !my_isalpha(cs,*in_pntr)) /* Skip pre-space */
|
||||||
in_pntr++;
|
in_pntr++;
|
||||||
}
|
}
|
||||||
*out_pntr++ = map[(uchar)*in_pntr]; /* Copy first letter */
|
*out_pntr++ = map[(uchar)*in_pntr]; /* Copy first letter */
|
||||||
@ -82,7 +82,7 @@ void soundex(CHARSET_INFO * cs,register my_string out_pntr, my_string in_pntr,
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
If alpha, map input letter to soundex code.
|
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
|
else return 0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ WF_PACK *wf_comp(my_string str)
|
|||||||
WF_PACK *ret;
|
WF_PACK *ret;
|
||||||
DBUG_ENTER("wf_comp");
|
DBUG_ENTER("wf_comp");
|
||||||
|
|
||||||
not_pos= -1; /* Skipp space and '!' in front */
|
not_pos= -1; /* Skip space and '!' in front */
|
||||||
while (*str == ' ')
|
while (*str == ' ')
|
||||||
str++;
|
str++;
|
||||||
if (*str == '!')
|
if (*str == '!')
|
||||||
|
@ -68,10 +68,10 @@ int my_error(int nr,myf MyFlags, ...)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Skipp if max size is used (to be compatible with printf) */
|
/* Skip if max size is used (to be compatible with printf) */
|
||||||
while (my_isdigit(&my_charset_latin1, *tpos) || *tpos == '.' || *tpos == '-')
|
while (my_isdigit(&my_charset_latin1, *tpos) || *tpos == '.' || *tpos == '-')
|
||||||
tpos++;
|
tpos++;
|
||||||
if (*tpos == 'l') /* Skipp 'l' argument */
|
if (*tpos == 'l') /* Skip 'l' argument */
|
||||||
tpos++;
|
tpos++;
|
||||||
if (*tpos == 's') /* String parameter */
|
if (*tpos == 's') /* String parameter */
|
||||||
{
|
{
|
||||||
|
@ -108,7 +108,7 @@ int my_setwd(const char *dir, myf MyFlags)
|
|||||||
{
|
{
|
||||||
uint drive,drives;
|
uint drive,drives;
|
||||||
|
|
||||||
pos++; /* Skipp FN_DEVCHAR */
|
pos++; /* Skip FN_DEVCHAR */
|
||||||
drive=(uint) (my_toupper(&my_charset_latin1,dir[0])-'A'+1);
|
drive=(uint) (my_toupper(&my_charset_latin1,dir[0])-'A'+1);
|
||||||
drives= (uint) -1;
|
drives= (uint) -1;
|
||||||
if ((pos-(byte*) dir) == 2 && drive > 0 && drive < 32)
|
if ((pos-(byte*) dir) == 2 && drive > 0 && drive < 32)
|
||||||
|
@ -16,7 +16,7 @@ usage() if ($opt_help || $opt_Information);
|
|||||||
$query=$search=$database=$set=""; $eoq=0;
|
$query=$search=$database=$set=""; $eoq=0;
|
||||||
while (<>)
|
while (<>)
|
||||||
{
|
{
|
||||||
next if (length($query) == 0 && /^\#/); # Skipp comments
|
next if (length($query) == 0 && /^\#/); # Skip comments
|
||||||
$query.=search($_);
|
$query.=search($_);
|
||||||
if ($eoq)
|
if ($eoq)
|
||||||
{
|
{
|
||||||
|
@ -4768,7 +4768,7 @@ simple_ident:
|
|||||||
|
|
||||||
field_ident:
|
field_ident:
|
||||||
ident { $$=$1;}
|
ident { $$=$1;}
|
||||||
| ident '.' ident { $$=$3;} /* Skipp schema name in create*/
|
| ident '.' ident { $$=$3;} /* Skip schema name in create*/
|
||||||
| '.' ident { $$=$2;} /* For Delphi */;
|
| '.' ident { $$=$2;} /* For Delphi */;
|
||||||
|
|
||||||
table_ident:
|
table_ident:
|
||||||
|
@ -745,7 +745,7 @@ bool str_to_time(const char *str,uint length,TIME *l_time)
|
|||||||
for (value=0; str != end && my_isdigit(&my_charset_latin1,*str) ; str++)
|
for (value=0; str != end && my_isdigit(&my_charset_latin1,*str) ; str++)
|
||||||
value=value*10L + (long) (*str - '0');
|
value=value*10L + (long) (*str - '0');
|
||||||
|
|
||||||
/* Skipp all space after 'days' */
|
/* Skip all space after 'days' */
|
||||||
end_of_days= str;
|
end_of_days= str;
|
||||||
for (; str != end && my_isspace(&my_charset_latin1, str[0]) ; str++)
|
for (; str != end && my_isspace(&my_charset_latin1, str[0]) ; str++)
|
||||||
;
|
;
|
||||||
|
@ -402,7 +402,7 @@ static my_bool my_like_range_big5(CHARSET_INFO *cs __attribute__((unused)),
|
|||||||
}
|
}
|
||||||
if (*ptr == escape && ptr+1 != end)
|
if (*ptr == escape && ptr+1 != end)
|
||||||
{
|
{
|
||||||
ptr++; /* Skipp escape */
|
ptr++; /* Skip escape */
|
||||||
*min_str++= *max_str++ = *ptr;
|
*min_str++= *max_str++ = *ptr;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -2715,7 +2715,7 @@ static my_bool my_like_range_gbk(CHARSET_INFO *cs __attribute__((unused)),
|
|||||||
}
|
}
|
||||||
if (*ptr == escape && ptr+1 != end)
|
if (*ptr == escape && ptr+1 != end)
|
||||||
{
|
{
|
||||||
ptr++; /* Skipp escape */
|
ptr++; /* Skip escape */
|
||||||
*min_str++= *max_str++ = *ptr;
|
*min_str++= *max_str++ = *ptr;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -671,7 +671,7 @@ my_bool my_like_range_tis620(CHARSET_INFO *cs __attribute__((unused)),
|
|||||||
{
|
{
|
||||||
if (*ptr == escape && ptr+1 != end)
|
if (*ptr == escape && ptr+1 != end)
|
||||||
{
|
{
|
||||||
ptr++; /* Skipp escape */
|
ptr++; /* Skip escape */
|
||||||
*min_str++ = *max_str++ = *ptr;
|
*min_str++ = *max_str++ = *ptr;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user