Merge 10.3 into 10.4

Author: dr-m

.gitmodules

@@ -1,13 +1,17 @@
 [submodule "libmariadb"]
 path = libmariadb
 url = https://github.com/MariaDB/mariadb-connector-c.git
+ignore = all
 [submodule "storage/rocksdb/rocksdb"]
 path = storage/rocksdb/rocksdb
 url = https://github.com/facebook/rocksdb.git
+ignore = all
 [submodule "wsrep-lib"]
 path = wsrep-lib
 url = https://github.com/codership/wsrep-lib.git
 branch = master
+ignore = all
 [submodule "extra/wolfssl/wolfssl"]
 path = extra/wolfssl/wolfssl
 url = https://github.com/wolfSSL/wolfssl.git
+ignore = all

debian/additions/innotop/innotop

@@ -4937,7 +4937,7 @@ sub noecho_password {
  };
 
  if ( $EVAL_ERROR ) {
- die "Cannot read respose; is Term::ReadKey installed? $EVAL_ERROR";
+ die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR";
  }
  return $response;
 }

debian/additions/mysqlreport

@@ -705,7 +705,7 @@ sub set_myisam_vals
 {
  print "set_myisam_vals\n" if $op{debug};
 
-# should be moved elsewere
+# should be moved elsewhere
  $questions = $stats{'Questions'};
 
  $key_read_ratio = sprintf "%.2f",
@@ -1366,7 +1366,7 @@ format QCACHE =
 __ Query Cache _________________________________________________________
 Memory usage @>>>>>> of @>>>>>> %Usage: @>>>>>
 make_short($qc_mem_used, 1), make_short($vars{'query_cache_size'}, 1), perc($qc_mem_used, $vars{'query_cache_size'})
-Block Fragmnt @>>>>>%
+Block Fragment @>>>>>%
 perc($stats{'Qcache_free_blocks'}, $stats{'Qcache_total_blocks'})
 Hits @>>>>>> @>>>>>/s
 make_short($stats{'Qcache_hits'}), t($stats{'Qcache_hits'})

debian/mariadb-server-10.4.postinst

@@ -99,7 +99,7 @@ EOF
 
  # This is important to avoid dataloss when there is a removed
  # mysql-server version from Woody lying around which used the same
- # data directory and then somewhen gets purged by the admin.
+ # data directory and then somehow gets purged by the admin.
  db_set mariadb-server/postrm_remove_database false || true
 
  # Clean up old flags before setting new one

extra/mariabackup/backup_copy.cc

@@ -1540,8 +1540,6 @@ bool backup_start(CorruptedPages &corrupted_pages)
 if (!write_galera_info(mysql_connection)) {
 return(false);
 }
- // copied from xtrabackup. what is it needed for here?
-write_current_binlog_file(mysql_connection);
 }
 
 if (opt_binlog_info == BINLOG_INFO_ON) {

extra/mariabackup/backup_mysql.cc

@@ -1448,14 +1448,18 @@ write_galera_info(MYSQL *connection)
 
 if ((state_uuid == NULL && state_uuid55 == NULL)
 || (last_committed == NULL && last_committed55 == NULL)) {
-msg("Failed to get master wsrep state from SHOW STATUS.");
-result = false;
+msg("Warning: failed to get master wsrep state from SHOW STATUS.");
+result = true;
 goto cleanup;
 }
 
 result = backup_file_printf(XTRABACKUP_GALERA_INFO,
 "%s:%s\n", state_uuid ? state_uuid : state_uuid55,
 last_committed ? last_committed : last_committed55);
+if (result)
+{
+write_current_binlog_file(connection);
+}
 
 cleanup:
 free_mysql_variables(status);

include/CMakeLists.txt

@@ -25,6 +25,7 @@ SET(HEADERS
  mysql.h 
  mysql_com.h
  mysql_com_server.h
+ mariadb_capi_rename.h
  pack.h
  my_byteorder.h
  byte_order_generic.h

include/heap.h

@@ -33,12 +33,12 @@ extern "C" {
 #include "my_compare.h"
 #include "my_tree.h"
 
-/* defines used by heap-funktions */
+/* defines used by heap-functions */
 
 #define HP_MAX_LEVELS4/* 128^5 records is enough */
 #define HP_PTRS_IN_NOD128
 
-/* struct used with heap_funktions */
+/* struct used with heap_functions */
 
 typedef struct st_heapinfo/* Struct from heap_info */
 {
@@ -107,7 +107,7 @@ typedef struct st_heap_block
  ulong last_allocated; /* number of records there is allocated space for */
 } HP_BLOCK;
 
-struct st_heap_info;/* For referense */
+struct st_heap_info;/* For reference */
 
 typedef struct st_hp_keydef/* Key definition with open */
 {

include/json_lib.h

@@ -372,7 +372,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state);
 
 
 /*
- Converst JSON string constant into ordinary string constant
+ Convert JSON string constant into ordinary string constant
  which can involve unpacking json escapes and changing character set.
  Returns negative integer in the case of an error,
  the length of the result otherwise.
@@ -383,7 +383,7 @@ int json_unescape(CHARSET_INFO *json_cs,
  uchar *res, uchar *res_end);
 
 /*
- Converst ordinary string constant into JSON string constant.
+ Convert ordinary string constant into JSON string constant.
  which can involve appropriate escaping and changing character set.
  Returns negative integer in the case of an error,
  the length of the result otherwise.

include/m_ctype.h

@@ -14,7 +14,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
 
 /*
- A better inplementation of the UNIX ctype(3) library.
+ A better implementation of the UNIX ctype(3) library.
 */
 
 #ifndef _m_ctype_h
@@ -123,7 +123,7 @@ uint16 *my_uca_contraction2_weight(const MY_CONTRACTIONS *c,
  my_wc_t wc1, my_wc_t wc2);
 
 
-/* Collation weights on a single level (e.g. primary, secondary, tertiarty) */
+/* Collation weights on a single level (e.g. primary, secondary, tertiary) */
 typedef struct my_uca_level_info_st
 {
  my_wc_t maxchar;
@@ -998,7 +998,7 @@ uint32 my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
  An extended version of my_convert(), to pass non-default mb_wc() and wc_mb().
  For example, String::copy_printable() which is used in
  Protocol::store_warning() uses this to escape control
- and non-convertable characters.
+ and non-convertible characters.
 */
 uint32 my_convert_using_func(char *to, size_t to_length, CHARSET_INFO *to_cs,
  my_charset_conv_wc_mb mb_wc,
@@ -1086,7 +1086,7 @@ size_t my_convert_fix(CHARSET_INFO *dstcs, char *dst, size_t dst_length,
  @param str - the beginning of the string
  @param end - the string end (the next byte after the string)
  @return >0, for a multi-byte character
- @rerurn 0, for a single byte character, broken sequence, empty string.
+ @return 0, for a single byte character, broken sequence, empty string.
 */
 static inline
 uint my_ismbchar(CHARSET_INFO *cs, const char *str, const char *end)