bk commit into 6.0 tree (gkodinov:1.2584)

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-22 15:20:13+02:00, gkodinov@stripped +1 -0
  correct typecasting for larger pointers

  include/m_string.h@stripped, 2008-02-22 15:20:11+02:00, gkodinov@stripped +7 -8
    correct typecasting for larger pointers

diff -Nrup a/include/m_string.h b/include/m_string.h
--- a/include/m_string.h	2008-02-19 18:41:30 +02:00
+++ b/include/m_string.h	2008-02-22 15:20:11 +02:00
@@ -340,18 +340,17 @@ typedef struct st_mysql_lex_string LEX_S
 
 static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len)
 {
-  const uchar *start= ptr;
   const uchar *end= ptr + len;
 
   if (len > 20)
   {
-    const uchar *end_words= (const uchar *)
-      (((intptr)end) / SIZEOF_INT * SIZEOF_INT);
-    const uchar *start_words= (const uchar *)
-       ((((intptr)start) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
+    const uchar *end_words= (const uchar *)(intptr)
+      (((ulonglong)(intptr)end) / SIZEOF_INT * SIZEOF_INT);
+    const uchar *start_words= (const uchar *)(intptr)
+       ((((ulonglong)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
 
-    DBUG_ASSERT(((intptr)start) >= SIZEOF_INT);
-    if (end_words > start)
+    DBUG_ASSERT(((ulonglong)(intptr)ptr) >= SIZEOF_INT);
+    if (end_words > ptr)
     {
       while (end > end_words && end[-1] == 0x20)
         end--;
@@ -360,7 +359,7 @@ static inline const uchar *skip_trailing
           end -= SIZEOF_INT;
     }
   }
-  while (end > start && end[-1] == 0x20)
+  while (end > ptr && end[-1] == 0x20)
     end--;
   return (end);
 }