diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
| commit | 5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf (patch) | |
| tree | 3c6e29d5a9d1f0a067dcdf4cca5b5747721aee89 /extra/comp_err.c | |
| parent | aa4357f3944032ab95137d52342bc7673159fc64 (diff) | |
| parent | 0eb26fdfa83d2ddd5f3dc3f8cf6e372a55b4c270 (diff) | |
| download | mariadb-git-5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'extra/comp_err.c')
| -rw-r--r-- | extra/comp_err.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index 53d8c18262b..4af17e3edf9 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -665,9 +665,9 @@ static struct message *find_message(struct errors *err, const char *lang, static ha_checksum checksum_format_specifier(const char* msg) { ha_checksum chksum= 0; - const char* p= msg; - const char* start= 0; - int num_format_specifiers= 0; + const uchar* p= (const uchar*) msg; + const uchar* start= NULL; + uint32 num_format_specifiers= 0; while (*p) { |