diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-29 12:06:54 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-29 12:06:54 +0300 |
| commit | d07c0afec91cad8c49be68b16f218a7112290d6b (patch) | |
| tree | b14df98b3e84047e2f5e4a19c725565055ed5bc3 /unittest | |
| parent | cb63e6d0214a2542fbb774c279af1a32abba68dd (diff) | |
| parent | 6f6a3e529310fa3f719ff0381ee94e83e7e93683 (diff) | |
| download | mariadb-git-d07c0afec91cad8c49be68b16f218a7112290d6b.tar.gz | |
Merge mysql-5.1-bugteam -> mysql-trunk-merge
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/strings/strings-t.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index 2d246cfa17f..278f42e56a5 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -30,7 +30,7 @@ test_like_range_for_charset(CHARSET_INFO *cs, const char *src, size_t src_len) cs->coll->like_range(cs, src, src_len, '\\', '_', '%', sizeof(min_str), min_str, max_str, &min_len, &max_len); - diag("min_len=%d\tmax_len=%d\t%s", min_len, max_len, cs->name); + diag("min_len=%d\tmax_len=%d\t%s", (int) min_len, (int) max_len, cs->name); min_well_formed_len= cs->cset->well_formed_len(cs, min_str, min_str + min_len, 10000, &error); @@ -39,11 +39,11 @@ test_like_range_for_charset(CHARSET_INFO *cs, const char *src, size_t src_len) 10000, &error); if (min_len != min_well_formed_len) diag("Bad min_str: min_well_formed_len=%d min_str[%d]=0x%02X", - min_well_formed_len, min_well_formed_len, + (int) min_well_formed_len, (int) min_well_formed_len, (uchar) min_str[min_well_formed_len]); if (max_len != max_well_formed_len) diag("Bad max_str: max_well_formed_len=%d max_str[%d]=0x%02X", - max_well_formed_len, max_well_formed_len, + (int) max_well_formed_len, (int) max_well_formed_len, (uchar) max_str[max_well_formed_len]); return min_len == min_well_formed_len && |