diff options
| author | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
| commit | 14650d4f66f9369eedba534a8434fe82c217e66d (patch) | |
| tree | 38ed48baf66a457188a181eeff05f39f32789b9b /regex/regerror.ih | |
| parent | f75271a53e2895c45c555f786982ad5120aed96b (diff) | |
| parent | 72340d672d573d21871b385b8ca5edd29e839a9b (diff) | |
| download | mariadb-git-14650d4f66f9369eedba534a8434fe82c217e66d.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
os2/MySQL-Source.icc:
Auto merged
regex/Makefile.am:
Auto merged
regex/engine.c:
Auto merged
regex/main.c:
Auto merged
regex/regerror.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'regex/regerror.ih')
| -rw-r--r-- | regex/regerror.ih | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/regerror.ih b/regex/regerror.ih index 2cb668c24f0..a4d048022f8 100644 --- a/regex/regerror.ih +++ b/regex/regerror.ih @@ -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 } |