From 93efa48a7b972fc463406603574a4d508eefe792 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 13 May 2018 18:50:21 +0200
Subject: [PATCH] fix failing main.mysql_client_test test on 32bit

in `ulonglong=ulong*uint` multiplication
is done in ulong, wrapping around on 32bit.

This became visible after C/C changed the
default charset to utf8, thus changing
mbmaxlem from 1 to 3.
---
 tests/mysql_client_fw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
index f69eb28a2871..4d036887629a 100644
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -768,7 +768,7 @@ static void do_verify_prepare_field(MYSQL_RES *result,
 {
   MYSQL_FIELD *field;
   CHARSET_INFO *cs;
-  ulonglong expected_field_length;
+  ulonglong expected_field_length= length;
 
   if (!(field= mysql_fetch_field_direct(result, no)))
   {
@@ -777,7 +777,7 @@ static void do_verify_prepare_field(MYSQL_RES *result,
   }
   cs= get_charset(field->charsetnr, 0);
   DIE_UNLESS(cs);
-  if ((expected_field_length= length * cs->mbmaxlen) > UINT_MAX32)
+  if ((expected_field_length*= cs->mbmaxlen) > UINT_MAX32)
     expected_field_length= UINT_MAX32;
   if (!opt_silent)
   {
s/storage.scm?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>tree</a><a href='/guix/commit/gnu/packages/storage.scm?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>commit</a><a href='/guix/diff/gnu/packages/storage.scm?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/storage.scm'>
<input type='hidden' name='id' value='9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>root</a>/<a href='/guix/log/gnu?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>gnu</a>/<a href='/guix/log/gnu/packages?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>packages</a>/<a href='/guix/log/gnu/packages/storage.scm?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306'>storage.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/storage.scm?id=9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-04-30 04:03:54 -0400'>2018-04-30</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-04-25 15:09:22 +0200'>2018-04-25</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=3743e1320eb6ff6da8265d6576d4a6969ec5514e'>gnu: ceph: Update to 12.2.5.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-29 16:54:52 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=12cb6c31df4b90d58658e88a256e36b6808e1064'>gnu: cmake: Update to 3.11.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-15 12:53:17 +0100'>2018-03-15</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=058ad040d64f873ffb9bb4d72166dae9f970b368'>gnu: Remove boost-1.66.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2018-03-04 17:54:40 +0100'>2018-03-04</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=5b0b520e22cc4d8e08078e50e036b093efdde49c'>gnu: ceph: Update to 12.2.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-01-19 17:28:31 +0100'>2018-01-19</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=162a13740041f907f0ce5c2aa05b52b162b4e81a'>gnu: Consistently Write ‘file system(s)’.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-12-28 08:24:42 +0100'>2017-12-28</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=5bf306f93ebcc9831a1e1facd5f1ce7c57514f89'>gnu: ceph: Disable tests.</a><span class='msg-avail'>...</span></td><td>Rutger Helling</td></tr>
<tr><td><span title='2017-11-17 22:36:26 +0100'>2017-11-17</span></td><td><a href='/guix/commit/gnu/packages/storage.scm?id=ac257f127ac5e1fd4758d3a05e4a19fde3af4e01'>gnu: Move testing packages from python.scm to check.scm.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>