From 5e597e267099a7b030bfe06005d390ddb333bb20 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Tue, 7 Dec 2004 17:01:46 +0400
Subject: [PATCH] #7066 [Ver]: "ctype_ucs" fails on SGI IRIX

---
 sql/table.cc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sql/table.cc b/sql/table.cc
index 370ad5eff1d..992f6df0401 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -495,8 +495,17 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
         char *from, *to;
         for (from= to= (char*) interval->type_names[pos]; *from; )
         {
-          *to++= (char) (hexchar_to_int(*from++) << 4) + 
-                         hexchar_to_int(*from++);
+          /*
+            Note, hexchar_to_int(*from++) doesn't work
+            one some compilers, e.g. IRIX. Looks like a compiler
+            bug in inline functions in combination with arguments
+            that have a side effect. So, let's use from[0] and from[1]
+            and increment 'from' by two later.
+          */
+
+          *to++= (char) (hexchar_to_int(from[0]) << 4) +
+                         hexchar_to_int(from[1]);
+          from+= 2;
         }
         interval->type_lengths[pos] /= 2;
       }