Merge branch '3.1' into 3.3

include/mariadb_com.h

@@ -423,6 +423,28 @@ struct rand_struct {
   double max_value_dbl;
 };
 
+  /* The following is for user defined functions */
+
+typedef struct st_udf_args
+{
+  unsigned int arg_count;		/* Number of arguments */
+  enum Item_result *arg_type;		/* Pointer to item_results */
+  char **args;				/* Pointer to argument */
+  unsigned long *lengths;		/* Length of string arguments */
+  char *maybe_null;			/* Set to 1 for all maybe_null args */
+} UDF_ARGS;
+
+  /* This holds information about the result */
+
+typedef struct st_udf_init
+{
+  my_bool maybe_null;			/* 1 if function can return NULL */
+  unsigned int decimals;		/* for real functions */
+  unsigned int max_length;		/* For string functions */
+  char	  *ptr;				/* free pointer for function data */
+  my_bool const_item;			/* 0 if result is independent of arguments */
+} UDF_INIT;
+
 /* Connection types */
 #define MARIADB_CONNECTION_UNIXSOCKET   0
 #define MARIADB_CONNECTION_TCP          1