bzr push into mysql-trunk branch (tor.didriksen:3801 to 3802)

[Tor Didriksen]

 3802 Tor Didriksen	2012-03-20
      Remove another ~1000 warnings on 64bit windows

    modified:
      sql/filesort_utils.h
      sql/sql_class.h
      sql/sql_error.h
 3801 Alexander Barkov	2012-03-20 [merge]
      Merging from mysql-5.5

    modified:
      mysql-test/r/ctype_ucs.result
      mysql-test/t/ctype_ucs.test
      sql/field.cc
=== modified file 'sql/filesort_utils.h'
--- a/sql/filesort_utils.h	2012-02-07 11:56:30 +0000
+++ b/sql/filesort_utils.h	2012-03-20 08:07:09 +0000
@@ -94,7 +94,10 @@ public:
 
   /// What is the <num_records, record_length> for the buffer?
   std::pair<uint, uint> sort_buffer_properties() const
-  { return std::make_pair(m_idx_array.size(), m_record_length); }
+  {
+    return std::make_pair(static_cast<uint>(m_idx_array.size()),
+                          m_record_length);
+  }
 
   /// Frees the buffer.
   void free_sort_buffer();

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2012-03-19 17:59:14 +0000
+++ b/sql/sql_class.h	2012-03-20 08:07:09 +0000
@@ -161,7 +161,7 @@ public:
   }
 
   inline char *str() const { return string.str; }
-  inline uint32 length() const { return string.length; }
+  inline size_t length() const { return string.length; }
   const CHARSET_INFO *charset() const { return cs; }
 
   friend LEX_STRING * thd_query_string (MYSQL_THD thd);
@@ -3663,7 +3663,7 @@ public:
     result= new_db && !db;
 #ifdef HAVE_PSI_THREAD_INTERFACE
     if (result)
-      PSI_CALL(set_thread_db)(new_db, new_db_len);
+      PSI_CALL(set_thread_db)(new_db, static_cast<int>(new_db_len));
 #endif
     return result;
   }
@@ -3684,7 +3684,7 @@ public:
     db= new_db;
     db_length= new_db_len;
 #ifdef HAVE_PSI_THREAD_INTERFACE
-    PSI_CALL(set_thread_db)(new_db, new_db_len);
+    PSI_CALL(set_thread_db)(new_db, static_cast<int>(new_db_len));
 #endif
   }
   /*

=== modified file 'sql/sql_error.h'
--- a/sql/sql_error.h	2012-03-13 07:39:53 +0000
+++ b/sql/sql_error.h	2012-03-20 08:07:09 +0000
@@ -573,7 +573,7 @@ public:
  
   ~ErrConvString() { };
   char *ptr() { return err_buffer; }
-  uint length() const { return buf_length; }
+  size_t length() const { return buf_length; }
 };
 
 ///////////////////////////////////////////////////////////////////////////

No bundle (reason: useless for push emails).