maria-10.0.16 merge

bzr merge -r4588 maria/10.0

4 files changed, 22 insertions, 9 deletions

diff --git a/include/my_check_opt.h b/include/my_check_opt.h
index a95cb79b3ac..ccf003decab 100644
--- a/include/my_check_opt.h
+++ b/include/my_check_opt.h
@@ -64,9 +64,11 @@ extern "C" {
 #define T_ZEROFILL_KEEP_LSN     (1ULL << 33)
 /** If repair should not bump create_rename_lsn */
 #define T_NO_CREATE_RENAME_LSN  (1ULL << 34)
-#define T_CREATE_UNIQUE_BY_SORT (1ULL << 35)
-#define T_SUPPRESS_ERR_HANDLING (1ULL << 36)
-#define T_FORCE_SORT_MEMORY     (1ULL << 37)
+/** If repair shouldn't do any locks */
+#define T_NO_LOCKS		(1ULL << 35)
+#define T_CREATE_UNIQUE_BY_SORT (1ULL << 36)
+#define T_SUPPRESS_ERR_HANDLING (1ULL << 37)
+#define T_FORCE_SORT_MEMORY     (1ULL << 38)
 
 #define T_REP_ANY		(T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
 
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 0be821586a1..7770c28f45f 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2013, Monty Program Ab.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates.
+   Copyright (c) 2009, 2014, MariaDB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -104,8 +104,18 @@ int pthread_attr_init(pthread_attr_t *connect_att);
 int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
 int pthread_attr_destroy(pthread_attr_t *connect_att);
 int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(void));
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
+
+static inline struct tm *localtime_r(const time_t *timep, struct tm *tmp)
+{
+  localtime_s(tmp, timep);
+  return tmp;
+}
+
+static inline struct tm *gmtime_r(const time_t *clock, struct tm *res)
+{
+  gmtime_s(res, clock);
+  return res;
+}
 
 void pthread_exit(void *a);
 int pthread_join(pthread_t thread, void **value_ptr);
@@ -721,11 +731,10 @@ struct st_my_thread_var
   mysql_cond_t * volatile current_cond;
   pthread_t pthread_self;
   my_thread_id id;
-  int cmp_length;
   int volatile abort;
   my_bool init;
   struct st_my_thread_var *next,**prev;
-  void *opt_info;
+  void *keycache_link;
   uint  lock_type; /* used by conditional release the queue */
   void  *stack_ends_here;
   safe_mutex_t *mutex_in_use;
diff --git a/include/mysql.h b/include/mysql.h
index 025bd397a65..63e86937063 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -75,6 +75,7 @@ typedef int my_socket;
 
 #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
 
+extern unsigned int mariadb_deinitialize_ssl;
 extern unsigned int mysql_port;
 extern char *mysql_unix_port;
 
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 6b60389acc3..dd794e856e1 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -172,6 +172,7 @@ extern LIST *list_reverse(LIST *root);
 extern void list_free(LIST *root,unsigned int free_data);
 extern unsigned int list_length(LIST *);
 extern int list_walk(LIST *,list_walk_action action,unsigned char * argument);
+extern unsigned int mariadb_deinitialize_ssl;
 extern unsigned int mysql_port;
 extern char *mysql_unix_port;
 typedef struct st_mysql_field {