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)
   {
48d26e33282b9ff1c1f1e3aae0a06e0285812'>tree</a><a href='/guix/commit/gnu/packages/mc.scm?id=29548d26e33282b9ff1c1f1e3aae0a06e0285812'>commit</a><a href='/guix/diff/gnu/packages/mc.scm?id=29548d26e33282b9ff1c1f1e3aae0a06e0285812'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/mc.scm'>
<input type='hidden' name='id' value='29548d26e33282b9ff1c1f1e3aae0a06e0285812'/><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=29548d26e33282b9ff1c1f1e3aae0a06e0285812'>root</a>/<a href='/guix/log/gnu?id=29548d26e33282b9ff1c1f1e3aae0a06e0285812'>gnu</a>/<a href='/guix/log/gnu/packages?id=29548d26e33282b9ff1c1f1e3aae0a06e0285812'>packages</a>/<a href='/guix/log/gnu/packages/mc.scm?id=29548d26e33282b9ff1c1f1e3aae0a06e0285812'>mc.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/mc.scm?id=29548d26e33282b9ff1c1f1e3aae0a06e0285812&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-12-31 01:44:04 +0100'>2016-12-31</span></td><td><a href='/guix/commit/gnu/packages/mc.scm?id=da62a4a19ea398e950aefcdd64ae25a475505e8f'>gnu: mc: Partially fix absolute file paths.</a><span class='msg-avail'>...<span class='msg-tooltip'>Partially fixes &lt;http://bugs.gnu.org/25273&gt;.

* gnu/packages/mc.scm (mc)[arguments]: Add new phase 'fix-absolutism.
This substitutes absolute file paths with functional file paths.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>ng0</td></tr>
<tr><td><span title='2016-04-02 23:39:32 +0300'>2016-04-02</span></td><td><a href='/guix/commit/gnu/packages/mc.scm?id=451c1436a38a92d6903f78381f74c935a332ee87'>gnu: mc: Update to 4.8.16.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/mc.scm (mc): Update to 4.8.16.
[source]: Remove patch.
* gnu/packages/patches/mc-fix-ncurses-build.patch: Remove.
* gnu-system.am (dist_patch_DATA): Remove it.
</span></span></td><td>Efraim Flashner</td></tr>