diff options
author | monty@narttu.mysql.fi <> | 2003-03-16 19:17:54 +0200 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2003-03-16 19:17:54 +0200 |
commit | a434bca70425e4497c8397d073b11be3620be999 (patch) | |
tree | 956d20750d7fec498888d037be8d588dab6412f0 /sql/unireg.h | |
parent | ce7db2827ee3ae8866882b777f2643914f56ead8 (diff) | |
parent | ba46c7289c3ce1517e595a37cef48ffb3c993bb0 (diff) | |
download | mariadb-git-a434bca70425e4497c8397d073b11be3620be999.tar.gz |
Merge with 4.0
Diffstat (limited to 'sql/unireg.h')
-rw-r--r-- | sql/unireg.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 2dc84720b2d..a5cd784a14a 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -84,7 +84,7 @@ #define SPECIAL_USE_LOCKS 1 /* Lock used databases */ #define SPECIAL_NO_NEW_FUNC 2 /* Skip new functions */ -#define SPECIAL_NEW_FUNC 4 /* New nonstandard functions */ +#define SPECIAL_SKIP_SHOW_DB 4 /* Don't allow 'show db' */ #define SPECIAL_WAIT_IF_LOCKED 8 /* Wait if locked database */ #define SPECIAL_SAME_DB_NAME 16 /* form name = file name */ #define SPECIAL_ENGLISH 32 /* English error messages */ @@ -94,7 +94,6 @@ #define SPECIAL_NO_HOST_CACHE 512 /* Don't cache hosts */ #define SPECIAL_LONG_LOG_FORMAT 1024 #define SPECIAL_SAFE_MODE 2048 -#define SPECIAL_SKIP_SHOW_DB 4096 /* Don't allow 'show db' */ /* Extern defines */ #define store_record(A,B) bmove_allign((A)->record[B],(A)->record[0],(size_t) (A)->reclength) |