diff options
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 3ff7f058e3c..a390b755772 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -1,3 +1,6 @@ +#ifndef UNIREG_INCLUDED +#define UNIREG_INCLUDED + /* Copyright (C) 2000-2006 MySQL AB This program is free software; you can redistribute it and/or modify @@ -16,8 +19,6 @@ /* Extra functions used by unireg library */ -#ifndef _unireg_h - #ifndef NO_ALARM_LOOP #define NO_ALARM_LOOP /* lib5 and popen can't use alarm */ #endif @@ -39,7 +40,11 @@ #define PLUGINDIR "lib/plugin" #endif -#define ER(X) errmesg[(X) - ER_ERROR_FIRST] +#define CURRENT_THD_ERRMSGS current_thd->variables.lc_messages->errmsgs->errmsgs +#define DEFAULT_ERRMSGS my_default_lc_messages->errmsgs->errmsgs + +#define ER(X) CURRENT_THD_ERRMSGS[(X) - ER_ERROR_FIRST] +#define ER_DEFAULT(X) DEFAULT_ERRMSGS[(X) - ER_ERROR_FIRST] #define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code") |