Merge 10.4 into 10.5

Author: dr-m

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Copyright (c) 2006, 2017, Oracle and/or its affiliates.
-# Copyright (c) 2008, 2019, MariaDB Corporation.
+# Copyright (c) 2008, 2020, MariaDB Corporation.
 # 
 # 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
@@ -254,6 +254,11 @@ INCLUDE(wsrep)
 INCLUDE(cpack_rpm)
 INCLUDE(cpack_deb)
 
+OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_EXIT()" ON)
+IF(WITH_DBUG_TRACE)
+  ADD_DEFINITIONS(-DDBUG_TRACE)
+ENDIF()
+
 # Always enable debug sync for debug builds.
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")

client/mysqldump.c

@@ -32,7 +32,7 @@
 ** master/autocommit code by Brian Aker <brian@tangent.org>
 ** SSL by
 ** Andrei Errapart <andreie@no.spam.ee>
-** Tõnu Samuel  <tonu@please.do.not.remove.this.spam.ee>
+** Tõnu Samuel  <tonu@please.do.not.remove.this.spam.ee>
 ** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up
 ** and adapted to mysqldump 05/11/01 by Jani Tolonen
 ** Added --single-transaction option 06/06/2002 by Peter Zaitsev

dbug/tests.c

@@ -4,6 +4,10 @@
 
 char *push1=0;
 
+#ifndef DBUG_TRACE
+#define DBUG_TRACE
+#endif
+
 #include <my_global.h>  /* This includes dbug.h */
 #include <my_sys.h>
 #include <my_pthread.h>

include/my_alarm.h

@@ -29,6 +29,13 @@ extern ulong my_time_to_wait_for_lock;
 
 #if defined(HAVE_ALARM) && !defined(NO_ALARM_LOOP)
 #include <signal.h>
+#ifdef HAVE_SIGHANDLER_T
+#define sig_return sighandler_t
+#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__)
+typedef void (*sig_return)(int); /* Returns type from signal */
+#else
+typedef void (*sig_return)(void); /* Returns type from signal */
+#endif
 #define ALARM_VARIABLES uint alarm_old=0; \
 			sig_return alarm_signal=0
 #define ALARM_INIT	my_have_got_alarm=0 ; \

include/my_dbug.h

@@ -67,6 +67,7 @@ extern void dbug_free_code_state(void **code_state_store);
 extern  const char* _db_get_func_(void);
 extern int (*dbug_sanity)(void);
 
+#ifdef DBUG_TRACE
 #define DBUG_LEAVE do { \
     _db_stack_frame_.line= __LINE__; \
     _db_return_ (&_db_stack_frame_); \
@@ -85,6 +86,13 @@ extern int (*dbug_sanity)(void);
 #define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0)
 #endif
 
+#else
+#define DBUG_LEAVE
+#define DBUG_ENTER(a)
+#define DBUG_RETURN(a1) return(a1)
+#define DBUG_VOID_RETURN return
+#endif
+
 #define DBUG_EXECUTE(keyword,a1) \
         do {if (_db_keyword_(0, (keyword), 0)) { a1 }} while(0)
 #define DBUG_EXECUTE_IF(keyword,a1) \

include/my_global.h

@@ -561,13 +561,6 @@ typedef int	my_socket;	/* File descriptor for sockets */
 #endif
 /* Type for functions that handles signals */
 #define sig_handler RETSIGTYPE
-C_MODE_START
-#ifdef HAVE_SIGHANDLER_T
-#define sig_return sighandler_t
-#else
-typedef void (*sig_return)(void); /* Returns type from signal */
-#endif
-C_MODE_END
 #if defined(__GNUC__) && !defined(_lint)
 typedef char	pchar;		/* Mixed prototypes can take char */
 typedef char	puchar;		/* Mixed prototypes can take char */

include/queues.h

@@ -53,31 +53,31 @@ typedef struct st_queue {
 #define queue_top(queue) ((queue)->root[1])
 #define queue_element(queue,index) ((queue)->root[index])
 #define queue_end(queue) ((queue)->root[(queue)->elements])
-#define queue_replace_top(queue) _downheap(queue, 1, (queue)->root[1])
+#define queue_replace_top(queue) _downheap(queue, 1)
 #define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg
 #define queue_set_max_at_top(queue, set_arg) \
   (queue)->max_at_top= set_arg ? -1 : 1
 #define queue_remove_top(queue_arg) queue_remove((queue_arg), queue_first_element(queue_arg))
 typedef int (*queue_compare)(void *,uchar *, uchar *);
 
 int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key,
-	       pbool max_at_top, queue_compare compare,
+	       my_bool max_at_top, queue_compare compare,
 	       void *first_cmp_arg, uint offset_to_queue_pos,
                uint auto_extent);
 int reinit_queue(QUEUE *queue,uint max_elements,uint offset_to_key,
-                 pbool max_at_top, queue_compare compare,
+                 my_bool max_at_top, queue_compare compare,
                  void *first_cmp_arg, uint offset_to_queue_pos,
                  uint auto_extent);
 int resize_queue(QUEUE *queue, uint max_elements);
 void delete_queue(QUEUE *queue);
-void queue_insert(QUEUE *queue,uchar *element);
+void queue_insert(QUEUE *queue, uchar *element);
 int queue_insert_safe(QUEUE *queue, uchar *element);
 uchar *queue_remove(QUEUE *queue,uint idx);
 void queue_replace(QUEUE *queue,uint idx);
 
 #define queue_remove_all(queue) { (queue)->elements= 0; }
 #define queue_is_full(queue) (queue->elements == queue->max_elements)
-void _downheap(QUEUE *queue, uint idx, uchar *element);
+void _downheap(QUEUE *queue, uint idx);
 void queue_fix(QUEUE *queue);
 #define is_queue_inited(queue) ((queue)->root != 0)
 

include/violite.h

@@ -153,6 +153,9 @@ typedef my_socket YASSL_SOCKET_T;
 #include <openssl/ssl.h>
 #undef Timeval
 #include <openssl/err.h>
+#ifdef DEPRECATED
+#undef DEPRECATED
+#endif
 
 enum enum_ssl_init_error
 {

libmariadb

@@ -206,7 +206,7 @@ int main(int argc, const char** argv )
     } else {
       if (strcmp(arg, "--verbose") == 0)
         verbose++;
-      else if (strncmp(arg, "--parent-pid", 10) == 0)
+      else if (strncmp(arg, "--parent-pid", 12) == 0)
       {
             /* Override parent_pid with a value provided by user */
         const char* start;