Merging with mysql-5.1-rep+2

1 files changed, 5 insertions, 4 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 8e0113283a3..3fa47e81c41 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -999,18 +999,19 @@ test_if_important_data(CHARSET_INFO *cs, const char *str, const char *strend)
 
 
 /**
-   Template function to compare two objects.
+   Function to compare two unsigned integers for their relative order.
+   Used below. In an anonymous namespace to not clash with definitions
+   in other files.
  */
 namespace {
-  template <class A_type, class B_type>
-  int compare(A_type a, B_type b)
+  int compare(unsigned int a, unsigned int b)
   {
     if (a < b)
       return -1;
     if (b < a)
       return 1;
     return 0;
-  }
+}
 }
 
 /**