From cb401dde68368d404f34a88f1f08f83040546e31 Mon Sep 17 00:00:00 2001
From: "mikael@dator6.(none)" <>
Date: Wed, 13 Jun 2007 16:12:02 +0200
Subject: [PATCH] manual merge

---
 sql/item.h          | 6 +++---
 sql/item_func.h     | 8 ++++----
 sql/item_timefunc.h | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sql/item.h b/sql/item.h
index 2c380fc2f69..fb2ccb6b2c9 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1627,7 +1627,7 @@ public:
   uint decimal_precision() const
   { return (uint)(max_length - test(value < 0)); }
   bool eq(const Item *, bool binary_cmp) const;
-  bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
+  bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
 };
 
 
@@ -1645,7 +1645,7 @@ public:
   void print(String *str);
   Item_num *neg ();
   uint decimal_precision() const { return max_length; }
-  bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
+  bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
 };
 
 
@@ -1688,7 +1688,7 @@ public:
   uint decimal_precision() const { return decimal_value.precision(); }
   bool eq(const Item *, bool binary_cmp) const;
   void set_decimal_value(my_decimal *value_par);
-  bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
+  bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
 };
 
 
diff --git a/sql/item_func.h b/sql/item_func.h
index dc53a63bfe8..8b4b66c1410 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -439,7 +439,7 @@ public:
   void fix_length_and_dec();
   void fix_num_length_and_dec();
   uint decimal_precision() const { return args[0]->decimal_precision(); }
-  bool check_partition_func_processor(byte *int_arg) {return FALSE;}
+  bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
 };
 
 
@@ -452,7 +452,7 @@ public:
   my_decimal *decimal_op(my_decimal *);
   const char *func_name() const { return "abs"; }
   void fix_length_and_dec();
-  bool check_partition_func_processor(byte *int_arg) {return FALSE;}
+  bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
 };
 
 // A class to handle logarithmic and trigonometric functions
@@ -619,7 +619,7 @@ public:
   longlong int_op();
   double real_op();
   my_decimal *decimal_op(my_decimal *);
-  bool check_partition_func_processor(byte *int_arg) {return FALSE;}
+  bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
 };
 
 
@@ -631,7 +631,7 @@ public:
   longlong int_op();
   double real_op();
   my_decimal *decimal_op(my_decimal *);
-  bool check_partition_func_processor(byte *int_arg) {return FALSE;}
+  bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
 };
 
 /* This handles round and truncate */
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index bdf3560a55d..32f5bcf8e52 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -127,7 +127,7 @@ public:
     max_length=10*my_charset_bin.mbmaxlen;
     maybe_null=1; 
   }
-  bool check_partition_func_processor(byte *int_arg) {return TRUE;}
+  bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
 };
 
 
@@ -301,7 +301,7 @@ class Item_func_dayname :public Item_func_weekday
     max_length=9*MY_CHARSET_BIN_MB_MAXLEN;
     maybe_null=1; 
   }
-  bool check_partition_func_processor(byte *int_arg) {return TRUE;}
+  bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
 };