diff options
| author | unknown <elliot@mysql.com> | 2006-06-23 17:27:54 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-06-23 17:27:54 -0400 |
| commit | b02748fd5c54e05aca990583a4cb0f71a82ee4b4 (patch) | |
| tree | e98cbbc277ba262a672f9a1aaef14d025bf1bc24 /regex | |
| parent | 2deb5a611ab594d0601b2d3adbf67d5e9a2922ba (diff) | |
| parent | 783866ffe105c3e83a9bbc101ddd31c0d8a81d1e (diff) | |
| download | mariadb-git-b02748fd5c54e05aca990583a4cb0f71a82ee4b4.tar.gz | |
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
mysql-test/r/func_time.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/lock_multi.result:
manual merge
mysql-test/t/lock_multi.test:
manual merge
sql/ha_innodb.cc:
manual merge
Diffstat (limited to 'regex')
| -rw-r--r-- | regex/regexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/regexec.c b/regex/regexec.c index b7ad83ba883..88bcc02323d 100644 --- a/regex/regexec.c +++ b/regex/regexec.c @@ -19,7 +19,7 @@ static int nope = 0; /* for use in asserts; shuts lint up */ /* 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)) |