diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-03-08 08:17:12 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-03-08 08:17:12 +0100 |
| commit | 3471a8b60a3d93a1c1af20c0fb3d0eefaef99da9 (patch) | |
| tree | 8c6410720bbfd0178d5d68d5491269b4cbfa7e57 /extra/comp_err.c | |
| parent | ef56d39bcc1c5acc1b0dd43ccd9addd8777a4dfe (diff) | |
| parent | 0a5780bc03a8876851fbaa4a0cfb8caa680c0535 (diff) | |
| download | mariadb-git-3471a8b60a3d93a1c1af20c0fb3d0eefaef99da9.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
extra/comp_err.c:
Auto merged
Diffstat (limited to 'extra/comp_err.c')
| -rw-r--r-- | extra/comp_err.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index ff1d114b27d..3f7664405ad 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -637,9 +637,9 @@ static struct message *find_message(struct errors *err, const char *lang, either. */ -static char checksum_format_specifier(const char* msg) +static ha_checksum checksum_format_specifier(const char* msg) { - char chksum= 0; + ha_checksum chksum= 0; const char* p= msg; const char* start= 0; int num_format_specifiers= 0; |