mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Many files:

Browse source 
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
This commit is contained in:
kent@mysql.com 2005-09-29 02:08:24 +02:00
parent 7e6a78a1ae
commit 844d964f2d
19 changed files with 97 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
client/mysqltest.c
View file

@ -59,7 +59,7 @@
#include <stdarg.h>
#include <sys/stat.h>
#include <violite.h>
#include <regex.h> /* Our own version of lib */
#include "my_regex.h" /* Our own version of lib */
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
@ -188,7 +188,7 @@ static int got_end_timer= FALSE;
static void timer_output(void);
static ulonglong timer_now(void);
static regex_t ps_re; /* Holds precompiled re for valid PS statements */
static my_regex_t ps_re; /* Holds precompiled re for valid PS statements */
static void ps_init_re(void);
static int ps_match_re(char *);
static char *ps_eprint(int);
@ -3585,12 +3585,13 @@ static void ps_init_re(void)
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*INSERT[[:space:]]+SELECT[[:space:]])";
int err= regcomp(&ps_re, ps_re_str, (REG_EXTENDED | REG_ICASE | REG_NOSUB),
&my_charset_latin1);
int err= my_regcomp(&ps_re, ps_re_str,
(REG_EXTENDED | REG_ICASE | REG_NOSUB),
&my_charset_latin1);
if (err)
{
char erbuf[100];
int len= regerror(err, &ps_re, erbuf, sizeof(erbuf));
int len= my_regerror(err, &ps_re, erbuf, sizeof(erbuf));
fprintf(stderr, "error %s, %d/%d `%s'\n",
ps_eprint(err), len, (int)sizeof(erbuf), erbuf);
exit(1);
@ -3600,7 +3601,7 @@ static void ps_init_re(void)
static int ps_match_re(char *stmt_str)
{
int err= regexec(&ps_re, stmt_str, (size_t)0, NULL, 0);
int err= my_regexec(&ps_re, stmt_str, (size_t)0, NULL, 0);
if (err == 0)
return 1;
@ -3609,7 +3610,7 @@ static int ps_match_re(char *stmt_str)
else
{
char erbuf[100];
int len= regerror(err, &ps_re, erbuf, sizeof(erbuf));
int len= my_regerror(err, &ps_re, erbuf, sizeof(erbuf));
fprintf(stderr, "error %s, %d/%d `%s'\n",
ps_eprint(err), len, (int)sizeof(erbuf), erbuf);
exit(1);
@ -3619,7 +3620,7 @@ static int ps_match_re(char *stmt_str)
static char *ps_eprint(int err)
{
static char epbuf[100];
size_t len= regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
size_t len= my_regerror(REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf));
assert(len <= sizeof(epbuf));
return(epbuf);
}
@ -3627,7 +3628,7 @@ static char *ps_eprint(int err)
static void ps_free_reg(void)
{
regfree(&ps_re);
my_regfree(&ps_re);
}
/****************************************************************************/

4
os2/MySQL-Source.icc
View file

@ -12,7 +12,7 @@ group client_global_pch =
'm_ctype.h', 'mysqld_error.h',
'my_list.h', 'my_sys.h', 'my_net.h',
'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h',
'.\regex\regex.h'
'.\regex\my_regex.h'
group server_global_pch =
'os2.h',
@ -38,7 +38,7 @@ group server_global_pch =
'my_tree.h', '..\mysys\my_static.h', 'netdb.h',
'thr_alarm.h', 'heap.h', '..\myisam\fulltext.h',
'..\myisam\ftdefs.h', 'myisammrg.h',
'.\regex\regex.h'
'.\regex\my_regex.h'
group server_pch =
'ha_heap.h', 'ha_myisammrg.h', 'opt_ft.h',

2
regex/Makefile.am
View file

@ -19,7 +19,7 @@ INCLUDES = @MT_INCLUDES@ \
-I$(top_builddir)/include -I$(top_srcdir)/include
noinst_LIBRARIES = libregex.a
LDADD= libregex.a $(top_builddir)/strings/libmystrings.a
noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c regex.h
noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h
libregex_a_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c
noinst_PROGRAMS = re
re_SOURCES = split.c debug.c main.c

5
regex/debug.c
View file

@ -2,7 +2,8 @@
#include <m_ctype.h>
#include <m_string.h>
#include <sys/types.h>
#include <regex.h>
#include "my_regex.h"
#include "utils.h"
#include "regex2.h"
#include "debug.ih"
@ -15,7 +16,7 @@
*/
void
regprint(r, d)
regex_t *r;
my_regex_t *r;
FILE *d;
{
register struct re_guts *g = r->re_g;

2
regex/debug.ih
View file

@ -4,7 +4,7 @@ extern "C" {
#endif
/* === debug.c === */
void regprint(regex_t *r, FILE *d);
void regprint(my_regex_t *r, FILE *d);
static void s_print(CHARSET_INFO *charset, register struct re_guts *g, FILE *d);
static char *regchar(CHARSET_INFO *charset, int ch,char *buf);

8
regex/engine.c
View file

@ -32,7 +32,7 @@
struct match {
struct re_guts *g;
int eflags;
regmatch_t *pmatch; /* [nsub+1] (0 element unused) */
my_regmatch_t *pmatch; /* [nsub+1] (0 element unused) */
char *offp; /* offsets work from here */
char *beginp; /* start of string -- virtual NUL precedes */
char *endp; /* end of string -- virtual NUL here */
@ -68,7 +68,7 @@ CHARSET_INFO *charset;
register struct re_guts *g;
char *str;
size_t nmatch;
regmatch_t pmatch[];
my_regmatch_t pmatch[];
int eflags;
{
register char *endp;
@ -148,8 +148,8 @@ int eflags;
/* oh my, he wants the subexpressions... */
if (m->pmatch == NULL)
m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
sizeof(regmatch_t));
m->pmatch = (my_regmatch_t *)malloc((m->g->nsub + 1) *
sizeof(my_regmatch_t));
if (m->pmatch == NULL) {
if (m->lastpos != NULL)
free((char *)m->lastpos);

2
regex/engine.ih
View file

@ -4,7 +4,7 @@ extern "C" {
#endif
/* === engine.c === */
static int matcher(CHARSET_INFO *charset,register struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
static int matcher(CHARSET_INFO *charset,register struct re_guts *g, char *string, size_t nmatch, my_regmatch_t pmatch[], int eflags);
static char *dissect(CHARSET_INFO *charset,register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
static char *backref(CHARSET_INFO *charset, register struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
static char *fast(CHARSET_INFO *charset, register struct match *m, char *start, char *stop, sopno startst, sopno stopst);

52
regex/main.c
View file

@ -1,9 +1,9 @@
#include <my_global.h>
#include <m_string.h>
#include <sys/types.h>
#include <regex.h>
#include <assert.h>
#include "my_regex.h"
#include "main.ih"
char *progname;
@ -27,9 +27,9 @@ int main(argc, argv)
int argc;
char *argv[];
{
regex_t re;
my_regex_t re;
# define NS 10
regmatch_t subs[NS];
my_regmatch_t subs[NS];
char erbuf[100];
int err;
size_t len;
@ -74,9 +74,9 @@ char *argv[];
exit(status);
}
err = regcomp(&re, argv[optind++], copts, &my_charset_latin1);
err = my_regcomp(&re, argv[optind++], copts, &my_charset_latin1);
if (err) {
len = regerror(err, &re, erbuf, sizeof(erbuf));
len = my_regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "error %s, %d/%d `%s'\n",
eprint(err), len, (int) sizeof(erbuf), erbuf);
exit(status);
@ -84,7 +84,7 @@ char *argv[];
regprint(&re, stdout);
if (optind >= argc) {
regfree(&re);
my_regfree(&re);
exit(status);
}
@ -92,9 +92,9 @@ char *argv[];
subs[0].rm_so = startoff;
subs[0].rm_eo = strlen(argv[optind]) - endoff;
}
err = regexec(&re, argv[optind], (size_t)NS, subs, eopts);
err = my_regexec(&re, argv[optind], (size_t)NS, subs, eopts);
if (err) {
len = regerror(err, &re, erbuf, sizeof(erbuf));
len = my_regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "error %s, %d/%d `%s'\n",
eprint(err), (int) len, (int) sizeof(erbuf), erbuf);
exit(status);
@ -136,7 +136,7 @@ FILE *in;
const char *badpat = "invalid regular expression";
# define SHORT 10
const char *bpname = "REG_BADPAT";
regex_t re;
my_regex_t re;
while (fgets(inbuf, sizeof(inbuf), in) != NULL) {
line++;
@ -163,27 +163,27 @@ FILE *in;
options('c', f[1]) &~ REG_EXTENDED);
}
ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
ne = my_regerror(REG_BADPAT, (my_regex_t *)NULL, erbuf, sizeof(erbuf));
if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
erbuf, badpat);
status = 1;
}
ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
ne = my_regerror(REG_BADPAT, (my_regex_t *)NULL, erbuf, (size_t)SHORT);
if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
ne != strlen(badpat)+1) {
fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
erbuf, SHORT-1, badpat);
status = 1;
}
ne = regerror(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
ne = my_regerror(REG_ITOA|REG_BADPAT, (my_regex_t *)NULL, erbuf, sizeof(erbuf));
if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
erbuf, bpname);
status = 1;
}
re.re_endp = bpname;
ne = regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
ne = my_regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
if (atoi(erbuf) != (int)REG_BADPAT) {
fprintf(stderr, "end: regerror() ATOI test gave `%s' not `%ld'\n",
erbuf, (long)REG_BADPAT);
@ -208,9 +208,9 @@ char *f3;
char *f4;
int opts; /* may not match f1 */
{
regex_t re;
my_regex_t re;
# define NSUBS 10
regmatch_t subs[NSUBS];
my_regmatch_t subs[NSUBS];
# define NSHOULD 15
char *should[NSHOULD];
int nshould;
@ -226,10 +226,10 @@ int opts; /* may not match f1 */
strcpy(f0copy, f0);
re.re_endp = (opts&REG_PEND) ? f0copy + strlen(f0copy) : NULL;
fixstr(f0copy);
err = regcomp(&re, f0copy, opts, &my_charset_latin1);
err = my_regcomp(&re, f0copy, opts, &my_charset_latin1);
if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
/* unexpected error or wrong error */
len = regerror(err, &re, erbuf, sizeof(erbuf));
len = my_regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "%d: %s error %s, %d/%d `%s'\n",
line, type, eprint(err), len,
(int) sizeof(erbuf), erbuf);
@ -243,7 +243,7 @@ int opts; /* may not match f1 */
}
if (err != 0) {
regfree(&re);
my_regfree(&re);
return;
}
@ -256,11 +256,11 @@ int opts; /* may not match f1 */
subs[0].rm_so = strchr(f2, '(') - f2 + 1;
subs[0].rm_eo = strchr(f2, ')') - f2;
}
err = regexec(&re, f2copy, NSUBS, subs, options('e', f1));
err = my_regexec(&re, f2copy, NSUBS, subs, options('e', f1));
if (err != 0 && (f3 != NULL || err != REG_NOMATCH)) {
/* unexpected error or wrong error */
len = regerror(err, &re, erbuf, sizeof(erbuf));
len = my_regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "%d: %s exec error %s, %d/%d `%s'\n",
line, type, eprint(err), len,
(int) sizeof(erbuf), erbuf);
@ -282,7 +282,7 @@ int opts; /* may not match f1 */
}
if (err != 0 || f4 == NULL) {
regfree(&re);
my_regfree(&re);
return;
}
@ -303,7 +303,7 @@ int opts; /* may not match f1 */
}
}
regfree(&re);
my_regfree(&re);
}
/*
@ -404,7 +404,7 @@ register char *p;
char * /* NULL or complaint */
check(str, sub, should)
char *str;
regmatch_t sub;
my_regmatch_t sub;
char *should;
{
register int len;
@ -485,7 +485,7 @@ int err;
static char epbuf[100];
size_t len;
len = regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
len = my_regerror(REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf));
assert(len <= sizeof(epbuf));
return(epbuf);
}
@ -499,11 +499,11 @@ efind(name)
char *name;
{
static char efbuf[100];
regex_t re;
my_regex_t re;
sprintf(efbuf, "REG_%s", name);
assert(strlen(efbuf) < sizeof(efbuf));
re.re_endp = efbuf;
(void) regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
(void) my_regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
return(atoi(efbuf));
}

2
regex/main.ih
View file

@ -9,7 +9,7 @@ void rx_try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
int options(int type, char *s);
int opt(int c, char *s);
void fixstr(register char *p);
char *check(char *str, regmatch_t sub, char *should);
char *check(char *str, my_regmatch_t sub, char *should);
static char *eprint(int err);
static int efind(char *name);

16
regex/regex.h → regex/my_regex.h
View file

@ -20,15 +20,15 @@ typedef struct {
const char *re_endp; /* end pointer for REG_PEND */
struct re_guts *re_g; /* none of your business :-) */
CHARSET_INFO *charset; /* For ctype things */
} regex_t;
} my_regex_t;
typedef struct {
regoff_t rm_so; /* start of match */
regoff_t rm_eo; /* end of match */
} regmatch_t;
} my_regmatch_t;
/* === regcomp.c === */
extern int regcomp(regex_t *, const char *, int, CHARSET_INFO *charset);
extern int my_regcomp(my_regex_t *, const char *, int, CHARSET_INFO *charset);
#define REG_BASIC 0000
#define REG_EXTENDED 0001
#define REG_ICASE 0002
@ -58,11 +58,11 @@ extern int regcomp(regex_t *, const char *, int, CHARSET_INFO *charset);
#define REG_INVARG 16
#define REG_ATOI 255 /* convert name to number (!) */
#define REG_ITOA 0400 /* convert number to name (!) */
extern size_t regerror(int, const regex_t *, char *, size_t);
extern size_t my_regerror(int, const my_regex_t *, char *, size_t);
/* === regexec.c === */
extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
extern int my_regexec(const my_regex_t *, const char *, size_t, my_regmatch_t [], int);
#define REG_NOTBOL 00001
#define REG_NOTEOL 00002
#define REG_STARTEND 00004
@ -72,12 +72,12 @@ extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
/* === regfree.c === */
extern void regfree(regex_t *);
extern void my_regfree(my_regex_t *);
/* === reginit.c === */
extern void regex_init(CHARSET_INFO *cs); /* Should be called for multithread progs */
extern void regex_end(void); /* If one wants a clean end */
extern void my_regex_init(CHARSET_INFO *cs); /* Should be called for multithread progs */
extern void my_regex_end(void); /* If one wants a clean end */
#ifdef __cplusplus
}

10
regex/regcomp.c
View file

@ -1,11 +1,11 @@
#include <my_global.h>
#include <m_string.h>
#include <m_ctype.h>
#include <regex.h>
#ifdef __WIN__
#include <limits.h>
#endif
#include "my_regex.h"
#include "utils.h"
#include "regex2.h"
@ -100,8 +100,8 @@ static int never = 0; /* for use in asserts; shuts lint up */
= #define REG_DUMP 0200
*/
int /* 0 success, otherwise REG_something */
regcomp(preg, pattern, cflags, charset)
regex_t *preg;
my_regcomp(preg, pattern, cflags, charset)
my_regex_t *preg;
const char *pattern;
int cflags;
CHARSET_INFO *charset;
@ -117,7 +117,7 @@ CHARSET_INFO *charset;
# define GOODFLAGS(f) ((f)&~REG_DUMP)
#endif
regex_init(charset); /* Init cclass if neaded */
my_regex_init(charset); /* Init cclass if neaded */
preg->charset=charset;
cflags = GOODFLAGS(cflags);
if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
@ -199,7 +199,7 @@ CHARSET_INFO *charset;
/* win or lose, we're done */
if (p->error != 0) /* lose */
regfree(preg);
my_regfree(preg);
return(p->error);
}

6
regex/regerror.c
View file

@ -1,8 +1,8 @@
#include <my_global.h>
#include <m_string.h>
#include <m_ctype.h>
#include <regex.h>
#include "my_regex.h"
#include "utils.h"
#include "regerror.ih"
@ -56,7 +56,7 @@ static struct rerr {
*/
/* ARGSUSED */
size_t
regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
my_regerror(int errcode, const my_regex_t *preg, char *errbuf, size_t errbuf_size)
{
register struct rerr *r;
register size_t len;
@ -101,7 +101,7 @@ regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
*/
static char *
regatoi(preg, localbuf)
const regex_t *preg;
const my_regex_t *preg;
char *localbuf;
{
register struct rerr *r;

2
regex/regerror.ih
View file

@ -4,7 +4,7 @@ extern "C" {
#endif
/* === regerror.c === */
static char *regatoi(const regex_t *preg, char *localbuf);
static char *regatoi(const my_regex_t *preg, char *localbuf);
#ifdef __cplusplus
}

9
regex/regexec.c
View file

@ -8,11 +8,10 @@
#include <my_global.h>
#include <m_string.h>
#include <m_ctype.h>
#include <regex.h>
#ifdef __WIN__
#include <limits.h>
#endif
#include "my_regex.h"
#include "utils.h"
#include "regex2.h"
@ -110,11 +109,11 @@ static int nope = 0; /* for use in asserts; shuts lint up */
* have been prototyped.
*/
int /* 0 success, REG_NOMATCH failure */
regexec(preg, str, nmatch, pmatch, eflags)
const regex_t *preg;
my_regexec(preg, str, nmatch, pmatch, eflags)
const my_regex_t *preg;
const char *str;
size_t nmatch;
regmatch_t pmatch[];
my_regmatch_t pmatch[];
int eflags;
{
register struct re_guts *g = preg->re_g;

6
regex/regfree.c
View file

@ -2,7 +2,7 @@
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <regex.h>
#include "my_regex.h"
#include "utils.h"
#include "regex2.h"
@ -12,8 +12,8 @@
= extern void regfree(regex_t *);
*/
void
regfree(preg)
regex_t *preg;
my_regfree(preg)
my_regex_t *preg;
{
register struct re_guts *g;

4
regex/reginit.c
View file

@ -7,7 +7,7 @@
static bool regex_inited=0;
void regex_init(CHARSET_INFO *cs)
void my_regex_init(CHARSET_INFO *cs)
{
char buff[CCLASS_LAST][256];
int count[CCLASS_LAST];
@ -67,7 +67,7 @@ void regex_init(CHARSET_INFO *cs)
return;
}
void regex_end()
void my_regex_end()
{
if (regex_inited)
{

32
sql/item_cmpfunc.cc
View file

@ -2556,14 +2556,14 @@ Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
return 0;
}
int error;
if ((error= regcomp(&preg,res->c_ptr(),
((cmp_collation.collation->state &
(MY_CS_BINSORT | MY_CS_CSSORT)) ?
REG_EXTENDED | REG_NOSUB :
REG_EXTENDED | REG_NOSUB | REG_ICASE),
cmp_collation.collation)))
if ((error= my_regcomp(&preg,res->c_ptr(),
((cmp_collation.collation->state &
(MY_CS_BINSORT | MY_CS_CSSORT)) ?
REG_EXTENDED | REG_NOSUB :
REG_EXTENDED | REG_NOSUB | REG_ICASE),
cmp_collation.collation)))
{
(void) regerror(error,&preg,buff,sizeof(buff));
(void) my_regerror(error,&preg,buff,sizeof(buff));
my_printf_error(ER_REGEXP_ERROR,ER(ER_REGEXP_ERROR),MYF(0),buff);
return 1;
}
@ -2605,15 +2605,15 @@ longlong Item_func_regex::val_int()
prev_regexp.copy(*res2);
if (regex_compiled)
{
regfree(&preg);
my_regfree(&preg);
regex_compiled=0;
}
if (regcomp(&preg,res2->c_ptr(),
((cmp_collation.collation->state &
(MY_CS_BINSORT | MY_CS_CSSORT)) ?
REG_EXTENDED | REG_NOSUB :
REG_EXTENDED | REG_NOSUB | REG_ICASE),
cmp_collation.collation))
if (my_regcomp(&preg,res2->c_ptr(),
((cmp_collation.collation->state &
(MY_CS_BINSORT | MY_CS_CSSORT)) ?
REG_EXTENDED | REG_NOSUB :
REG_EXTENDED | REG_NOSUB | REG_ICASE),
cmp_collation.collation))
{
null_value=1;
return 0;
@ -2622,7 +2622,7 @@ longlong Item_func_regex::val_int()
}
}
null_value=0;
return regexec(&preg,res->c_ptr(),0,(regmatch_t*) 0,0) ? 0 : 1;
return my_regexec(&preg,res->c_ptr(),0,(my_regmatch_t*) 0,0) ? 0 : 1;
}
@ -2632,7 +2632,7 @@ void Item_func_regex::cleanup()
Item_bool_func::cleanup();
if (regex_compiled)
{
regfree(&preg);
my_regfree(&preg);
regex_compiled=0;
}
DBUG_VOID_RETURN;

4
sql/item_cmpfunc.h
View file

@ -915,11 +915,11 @@ public:
#ifdef USE_REGEX
#include <regex.h>
#include "my_regex.h"
class Item_func_regex :public Item_bool_func
{
regex_t preg;
my_regex_t preg;
bool regex_compiled;
bool regex_is_const;
String prev_regexp;

8
sql/mysqld.cc
View file

@ -1028,7 +1028,7 @@ void clean_up(bool print_message)
my_free((gptr) ssl_acceptor_fd, MYF(MY_ALLOW_ZERO_PTR));
#endif /* HAVE_OPENSSL */
#ifdef USE_REGEX
regex_end();
my_regex_end();
#endif
if (print_message && errmesg)
@ -2529,7 +2529,7 @@ static int init_common_variables(const char *conf_file_name, int argc,
set_var_init();
mysys_uses_curses=0;
#ifdef USE_REGEX
regex_init(&my_charset_latin1);
my_regex_init(&my_charset_latin1);
#endif
if (!(default_charset_info= get_charset_by_csname(default_character_set_name,
MY_CS_PRIMARY,
@ -5879,7 +5879,7 @@ static void mysql_init_variables(void)
#else
have_openssl=SHOW_OPTION_NO;
#endif
#ifdef HAVE_BROKEN_REALPATH
#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
have_symlink=SHOW_OPTION_NO;
#else
have_symlink=SHOW_OPTION_YES;
@ -6550,7 +6550,7 @@ static void get_options(int argc,char **argv)
usage();
exit(0);
}
#if defined(HAVE_BROKEN_REALPATH)
#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
my_use_symdir=0;
my_disable_symlinks=1;
have_symlink=SHOW_OPTION_NO;