bk commit into 5.0 tree (iggy:1.2188) BUG#19407

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2188 06/06/19 22:19:05 iggy@stripped +1 -0
  Bug#19407 Test 'func_regexp' fails on Windows x64

  regex/regexec.c
    1.8 06/06/19 22:19:00 iggy@stripped +1 -1
    The Win64 pre-processor evaluates state1 at the end of the chain at replace-time not
at definition-time.  This causes states1 to be defined as char *.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-5.0

--- 1.7/regex/regexec.c	2005-09-28 20:07:28 -04:00
+++ 1.8/regex/regexec.c	2006-06-19 22:19:00 -04:00
@@ -19,7 +19,7 @@ static int nope = 0;		/* for use in asse
 
 /* macros for manipulating states, small version */
 #define	states	long
-#define	states1	states		/* for later use in regexec() decision */
+#define	states1	long		/* for later use in regexec() decision. Ensure Win64 definition is
correct.*/
 #define	CLEAR(v)	((v) = 0)
 #define	SET0(v, n)	((v) &= ~((states) 1 << (n)))
 #define	SET1(v, n)	((v) |= (states) 1 << (n))