diff options
| author | monty@donna.mysql.com <> | 2001-02-15 03:43:14 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-02-15 03:43:14 +0200 |
| commit | 450d98e3418fc3e267833d3ad13d45b539269fac (patch) | |
| tree | 48461790e73014dbea005fbd6ef8d48e83cc6f14 /mysys/my_error.c | |
| parent | 7de40020d7684af7ec139455ca99ce6480f434e0 (diff) | |
| download | mariadb-git-450d98e3418fc3e267833d3ad13d45b539269fac.tar.gz | |
Changed --replace to --replace_result in mysqltest
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
Diffstat (limited to 'mysys/my_error.c')
| -rw-r--r-- | mysys/my_error.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |