Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/field.h b/sql/field.h
index f784ed82ecc..8aad6783291 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1803,7 +1803,12 @@ class Send_field {
 */
 
 class Copy_field :public Sql_alloc {
-  void (*get_copy_func(Field *to,Field *from))(Copy_field *);
+  /**
+    Convenience definition of a copy function returned by
+    get_copy_func.
+  */
+  typedef void Copy_func(Copy_field*);
+  Copy_func *get_copy_func(Field *to, Field *from);
 public:
   uchar *from_ptr,*to_ptr;
   uchar *from_null_ptr,*to_null_ptr;