Cleanups & safety fixes

include/mysql.h:
  cleanup of load data infile patch
libmysql/libmysql.c:
  cleanup of load data infile patch
myisam/mi_search.c:
  Added missing assert.h
mysql-test/r/func_time.result:
  Make test more secure
mysql-test/t/func_time.test:
  Make test more secure
sql/item.cc:
  restore to use str_value in item::save_in_field
sql/item.h:
  Simple cleanup
sql/item_cmpfunc.cc:
  Safety fix
sql/item_cmpfunc.h:
  Simple optimization
sql/item_func.cc:
  Updated comment
sql/sql_base.cc:
  Simple optimization
sql/sql_select.cc:
  Simple optimization
sql/sql_union.cc:
  safey fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/include/mysql.h b/include/mysql.h
index d922b552e38..dcdbe3a07a4 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -187,9 +187,9 @@ struct st_mysql_options {
   my_bool secure_auth;
 
   /* function pointers for local infile support */
-  int (*local_infile_init)(void **, char *);
+  int (*local_infile_init)(void **, const char *);
   int (*local_infile_read)(void *, char *, uint);
-  int (*local_infile_end)(void *);
+  void (*local_infile_end)(void *);
   int (*local_infile_error)(void *, char *, uint);
 };
 
@@ -394,12 +394,12 @@ my_bool		STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
 
 #define LOCAL_INFILE_ERROR_LEN 512
 
-int
+void
 mysql_set_local_infile_handler(MYSQL *mysql,
-                               int (*local_infile_init)(void **, char *),       
+                               int (*local_infile_init)(void **, const char *),
                                int (*local_infile_read)(void *, char *, uint),
-                               int (*local_infile_end)(void *),
-                               int (*local_infile_error)(void *, char *, uint));
+                               void (*local_infile_end)(void *),
+                               int (*local_infile_error)(void *, char*, uint));
 
 void
 mysql_set_local_infile_default(MYSQL *mysql);