summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authortsmith@quadxeon.mysql.com <>2007-03-08 08:17:12 +0100
committertsmith@quadxeon.mysql.com <>2007-03-08 08:17:12 +0100
commit0303429257f2da9f70b4e8a3d129a9556959b2d4 (patch)
tree8c6410720bbfd0178d5d68d5491269b4cbfa7e57 /extra
parentec871681153186130ec59c7a0fbe045b6cc4e891 (diff)
parentfee7ab58c6daaf14fc1bd63f9b954b2834671a5c (diff)
downloadmariadb-git-0303429257f2da9f70b4e8a3d129a9556959b2d4.tar.gz
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
Diffstat (limited to 'extra')
-rw-r--r--extra/comp_err.c4
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;