diff options
| author | monty@mishka.local <> | 2004-10-20 01:28:42 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-10-20 01:28:42 +0300 |
| commit | 04c23808a856bd8c4425d52419592d58d9bc5f35 (patch) | |
| tree | 1919e7f3a6a68e36dbbcf1dd8b6cd8729a975e36 /regex | |
| parent | 57a85986ac46550dcf7ced4cb50111efe2a6e0ad (diff) | |
| download | mariadb-git-04c23808a856bd8c4425d52419592d58d9bc5f35.tar.gz | |
Review of all code pushed since last review
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
Diffstat (limited to 'regex')
| -rw-r--r-- | regex/regcomp.c | 2 | ||||
| -rw-r--r-- | regex/regcomp.ih | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/regex/regcomp.c b/regex/regcomp.c index 31899609e3c..5f0351c32aa 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -1183,6 +1183,7 @@ register cset *cs; return(n); } +#ifdef USE_ORIG_REGEX_CODE /* - mcadd - add a collating element to a cset == static void mcadd(register struct parse *p, register cset *cs, \ @@ -1209,6 +1210,7 @@ register char *cp; (void) strcpy(cs->multis + oldend - 1, cp); cs->multis[cs->smultis - 1] = '\0'; } +#endif #ifdef NOT_USED /* diff --git a/regex/regcomp.ih b/regex/regcomp.ih index 32f1f6e89eb..5deba89217a 100644 --- a/regex/regcomp.ih +++ b/regex/regcomp.ih @@ -27,7 +27,9 @@ static void freeset(register struct parse *p, register cset *cs); static int freezeset(register struct parse *p, register cset *cs); static int firstch(register struct parse *p, register cset *cs); static int nch(register struct parse *p, register cset *cs); +#ifdef USE_ORIG_REGEX_CODE static void mcadd(register struct parse *p, register cset *cs, register char *cp); +#endif #ifdef NOT_USED static void mcsub(register cset *cs, register char *cp); static int mcin(register cset *cs, register char *cp); |