diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/errors.c | 4 | ||||
| -rw-r--r-- | mysys/my_error.c | 6 | ||||
| -rw-r--r-- | mysys/typelib.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index c2c1b8ffcc3..6e9f1fabab0 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -50,14 +50,14 @@ const char * NEAR globerrs[GLOBERRS]= void init_glob_errs(void) { - errmsg[GLOB] = & globerrs[0]; + my_errmsg[GLOB] = & globerrs[0]; } /* init_glob_errs */ #else void init_glob_errs() { - errmsg[GLOB] = & globerrs[0]; + my_errmsg[GLOB] = & globerrs[0]; EE(EE_FILENOTFOUND) = "File '%s' not found (Errcode: %d)"; EE(EE_CANTCREATEFILE) = "Can't create/write to file '%s' (Errcode: %d)"; diff --git a/mysys/my_error.c b/mysys/my_error.c index 26510f08480..562b192b24d 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -23,7 +23,7 @@ /* Define some external variables for error handling */ -const char ** NEAR errmsg[MAXMAPS]={0,0,0,0}; +const char ** NEAR my_errmsg[MAXMAPS]={0,0,0,0}; char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; /* Error message to user */ @@ -42,10 +42,10 @@ int my_error(int nr,myf MyFlags, ...) va_start(ap,MyFlags); DBUG_PRINT("my", ("nr: %d MyFlags: %d errno: %d", nr, MyFlags, errno)); - if (nr / ERRMOD == GLOB && errmsg[GLOB] == 0) + if (nr / ERRMOD == GLOB && my_errmsg[GLOB] == 0) init_glob_errs(); - olen=(uint) strlen(tpos=errmsg[nr / ERRMOD][nr % ERRMOD]); + olen=(uint) strlen(tpos=my_errmsg[nr / ERRMOD][nr % ERRMOD]); endpos=ebuff; while (*tpos) diff --git a/mysys/typelib.c b/mysys/typelib.c index 929278d1b8f..b18959442ae 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -56,7 +56,7 @@ int find_type(my_string x, TYPELIB *typelib, uint full_name) if (! *i) DBUG_RETURN(pos+1); } - if (! *i) + if (! *i && (!*j || !(full_name & 1))) { find++; findpos=pos; @@ -64,7 +64,7 @@ int find_type(my_string x, TYPELIB *typelib, uint full_name) } if (find == 0 && (full_name & 4) && x[0] == '#' && strend(x)[-1] == '#' && (findpos=atoi(x+1)-1) >= 0 && (uint) findpos < typelib->count) - find=1; + find=1; else if (find == 0 || ! x[0]) { DBUG_PRINT("exit",("Couldn't find type")); |