diff options
author | unknown <monty@mishka.local> | 2004-10-20 01:28:42 +0300 |
---|---|---|
committer | unknown <monty@mishka.local> | 2004-10-20 01:28:42 +0300 |
commit | 4736d0fe9963742e2788960d60da7f0f2dd593e9 (patch) | |
tree | 1919e7f3a6a68e36dbbcf1dd8b6cd8729a975e36 /regex | |
parent | 46b10a307fcaf3449f2bcf3b989feb0e1c53e7b6 (diff) | |
download | mariadb-git-4736d0fe9963742e2788960d60da7f0f2dd593e9.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
client/mysqlimport.c:
Remove not used variable
client/mysqltest.c:
Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
Simplified code
Remove usage of sprintf("%llu") as this is not portable
include/mysql.h:
Added mysql_embedded() to be able to easily check if we are using the embedded server
innobase/srv/srv0start.c:
Don't use memcmp() when using purify (to avoid false warnings)
libmysql/libmysql.c:
Added mysql_embedded() to be able to easily check if we are using the embedded server
libmysql/libmysql.def:
Added mysql_embedded() to be able to easily check if we are using the embedded server
myisam/myisam_ftdump.c:
Remove compiler warning
myisam/myisamchk.c:
Remove compiler warning
myisam/rt_test.c:
#ifdef not used code
mysys/hash.c:
Remove compiler warning (from last push)
mysys/my_gethwaddr.c:
Remove compiler warning
ndb/src/ndbapi/ndberror.c:
#ifdef not used code
regex/regcomp.c:
Remove not used code
regex/regcomp.ih:
Remove not used code (to remove compiler warnings)
sql-common/client.c:
Remove compiler warnings
sql/field.cc:
Simple optimization
sql/ha_innodb.cc:
Rename mysql_embedded -> mysqld_embedded
sql/item.cc:
Fix comments
Move variables first on block
Remove else after return
Simple optimizations
(no logic changes)
sql/item_cmpfunc.cc:
Added comment
sql/mysql_priv.h:
Rename mysql_embedded -> mysqld_embedded
sql/mysqld.cc:
Rename mysql_embedded -> mysqld_embedded
sql/sql_acl.cc:
Added comments
simple optimization
Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES
sql/sql_select.cc:
More comments
Simple optimization
sql/sql_show.cc:
Simple changes to make similar code similar
More comments
sql/sql_string.cc:
Trivial optimization and better code layout
strings/Makefile.am:
Change xml.c to use bcmp to avoid warnings from purify
strings/xml.c:
Change xml.c to use bcmp to avoid warnings from purify
tests/client_test.c:
Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
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); |