summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/nosik.monty.fi>2006-11-20 22:46:52 +0200
committerunknown <monty@mysql.com/nosik.monty.fi>2006-11-20 22:46:52 +0200
commit886965303155d1c2fbd90e3606fd192d4ba7741b (patch)
tree352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /regex
parentdaaddeb656c26c685962fef69d19e7f264620e2b (diff)
parent14decc4fbc04b8ce0c5efb7d76b711c6e60a0266 (diff)
downloadmariadb-git-886965303155d1c2fbd90e3606fd192d4ba7741b.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0 mysql-test/t/ctype_ucs.test: Auto merged sql/log_event.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged
Diffstat (limited to 'regex')
-rw-r--r--regex/regexec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/regex/regexec.c b/regex/regexec.c
index 88bcc02323d..338c1bfa7fe 100644
--- a/regex/regexec.c
+++ b/regex/regexec.c
@@ -15,7 +15,8 @@
#include "utils.h"
#include "regex2.h"
-static int nope = 0; /* for use in asserts; shuts lint up */
+/* for use in asserts */
+#define nope 0
/* macros for manipulating states, small version */
#define states long