diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /unittest/strings/strings-t.c | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'unittest/strings/strings-t.c')
| -rw-r--r-- | unittest/strings/strings-t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index fe595a5c303..22b50fc1659 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -627,7 +627,7 @@ strcollsp(CHARSET_INFO *cs, const STRNNCOLL_PARAM *param) { char ahex[64], bhex[64]; int res= cs->coll->strnncollsp(cs, (uchar *) p->a, p->alen, - (uchar *) p->b, p->blen, 0); + (uchar *) p->b, p->blen); str2hex(ahex, sizeof(ahex), p->a, p->alen); str2hex(bhex, sizeof(bhex), p->b, p->blen); diag("%-20s %-10s %-10s %10d %10d%s", @@ -641,7 +641,7 @@ strcollsp(CHARSET_INFO *cs, const STRNNCOLL_PARAM *param) { /* Test in reverse order */ res= cs->coll->strnncollsp(cs, (uchar *) p->b, p->blen, - (uchar *) p->a, p->alen, 0); + (uchar *) p->a, p->alen); if (!eqres(res, -p->res)) { diag("Comparison in reverse order failed. Expected %d, got %d", |