Merge branch 'bb-10.1-serg' into 10.1

Docs/mysql.info

@@ -1,11 +1,11 @@
 MariaDB is in most aspects identical to MySQL.
 
 Differences between MySQL and MariaDB can be found at:
-http://kb.askmonty.org/en/mariadb-versus-mysql-features/
-http://kb.askmonty.org/en/mariadb-versus-mysql-compatibility/
+https://mariadb.com/kb/en/mariadb-vs-mysql-features/
+https://mariadb.com/kb/en/mariadb-vs-mysql-compatibility/
 
 The MariaDB manual can be found at:
-http://kb.askmonty.org/
+https://mariadb.com/kb/
 
 The MySQL Reference Manual is available in various formats on
 http://dev.mysql.com/doc.

Docs/sp-imp-spec.txt

@@ -243,7 +243,7 @@
        in the caller's frame is set in the new context as well.
     4) For each instruction, call its execute() method.
        The result is a pointer to the next instruction to execute (or NULL)
-       if an error occured.
+       if an error occurred.
     5) On success, set the new values of the OUT and INOUT parameters in
        the caller's frame.
 
@@ -853,7 +853,7 @@
           // '*nextp' will be set to the index of the next instruction
           // to execute. (For most instruction this will be the
           // instruction following this one.)
-          // Returns 0 on success, non-zero if some error occured.
+          // Returns 0 on success, non-zero if some error occurred.
           virtual int execute(THD *, uint *nextp)
         }
 

INSTALL-SOURCE

@@ -1,3 +1,3 @@
 Instructions for building MariaDB can be found at:
-https://kb.askmonty.org/en/compiling-mariadb-from-source/
+https://mariadb.com/kb/en/compiling-mariadb-from-source
 

INSTALL-WIN-SOURCE

@@ -1,3 +1,3 @@
 Up-to-date instructions about building MariaDB on Windows can be found
-at: http://kb.askmonty.org/en/building-mariadb-on-windows
+at: https://mariadb.com/kb/en/Building_MariaDB_on_Windows
 

client/mysql.cc

@@ -3354,7 +3354,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
 
 end:
 
- /* Show warnings if any or error occured */
+ /* Show warnings if any or error occurred */
   if (show_warnings == 1 && (warnings >= 1 || error))
     print_warnings();
 

client/mysql_upgrade.c

@@ -658,7 +658,7 @@ static int get_upgrade_info_file_name(char* name)
 /*
   Read the content of mysql_upgrade_info file and
   compare the version number form file against
-  version number wich mysql_upgrade was compiled for
+  version number which mysql_upgrade was compiled for
 
   NOTE
   This is an optimization to avoid running mysql_upgrade

client/mysqlcheck.c

@@ -277,8 +277,8 @@ static void usage(void)
   printf("Usage: %s [OPTIONS] database [tables]\n", my_progname);
   printf("OR     %s [OPTIONS] --databases DB1 [DB2 DB3...]\n",
 	 my_progname);
-  puts("Please consult the MariaDB/MySQL knowledgebase at");
-  puts("http://kb.askmonty.org/v/mysqlcheck for latest information about");
+  puts("Please consult the MariaDB Knowledge Base at");
+  puts("https://mariadb.com/kb/en/mysqlcheck for latest information about");
   puts("this program.");
   print_defaults("my", load_default_groups);
   puts("");
@@ -523,7 +523,6 @@ static int is_view(const char *table)
   {
     fprintf(stderr, "Failed to %s\n", query);
     fprintf(stderr, "Error: %s\n", mysql_error(sock));
-    my_free(query);
     DBUG_RETURN(-1);
   }
   res= mysql_store_result(sock);

client/mysqltest.cc

@@ -1104,7 +1104,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
   Run query and dump the result to stderr in vertical format
 
   NOTE! This function should be safe to call when an error
-  has occured and thus any further errors will be ignored(although logged)
+  has occurred and thus any further errors will be ignored (although logged)
 
   SYNOPSIS
   show_query
@@ -1170,7 +1170,7 @@ static void show_query(MYSQL* mysql, const char* query)
   is added to the warning stack, only print @@warning_count-1 warnings.
 
   NOTE! This function should be safe to call when an error
-  has occured and this any further errors will be ignored(although logged)
+  has occurred and this any further errors will be ignored(although logged)
 
   SYNOPSIS
   show_warnings_before_error
@@ -4699,7 +4699,7 @@ void do_sync_with_master2(struct st_command *command, long offset,
         master_pos_wait returned NULL. This indicates that
         slave SQL thread is not started, the slave's master
         information is not initialized, the arguments are
-        incorrect, or an error has occured
+        incorrect, or an error has occurred
       */
       die("%.*s failed: '%s' returned NULL "          \
           "indicating slave SQL thread failure",

cmake/cpack_rpm.cmake

@@ -43,8 +43,8 @@ SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_SUMMARY}
 It is GPL v2 licensed, which means you can use the it free of charge under the
 conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
 
-MariaDB documentation can be found at http://kb.askmonty.org/
-MariaDB bug reports should be submitted through https://mariadb.atlassian.net/
+MariaDB documentation can be found at https://mariadb.com/kb
+MariaDB bug reports should be submitted through https://jira.mariadb.org 
 
 ")
 
@@ -78,14 +78,16 @@ SET(ignored
   "%ignore ${CMAKE_INSTALL_PREFIX}/bin"
   "%ignore ${CMAKE_INSTALL_PREFIX}/include"
   "%ignore ${CMAKE_INSTALL_PREFIX}/lib"
+  "%ignore ${CMAKE_INSTALL_PREFIX}/lib/systemd"
+  "%ignore ${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
   "%ignore ${CMAKE_INSTALL_PREFIX}/lib64"
   "%ignore ${CMAKE_INSTALL_PREFIX}/sbin"
   "%ignore ${CMAKE_INSTALL_PREFIX}/share"
   "%ignore ${CMAKE_INSTALL_PREFIX}/share/aclocal"
   "%ignore ${CMAKE_INSTALL_PREFIX}/share/doc"
   "%ignore ${CMAKE_INSTALL_PREFIX}/share/man"
-  "%ignore ${CMAKE_INSTALL_PREFIX}/share/man/man1*"
-  "%ignore ${CMAKE_INSTALL_PREFIX}/share/man/man8*"
+  "%ignore ${CMAKE_INSTALL_PREFIX}/share/man/man1"
+  "%ignore ${CMAKE_INSTALL_PREFIX}/share/man/man8"
   "%ignore ${CMAKE_INSTALL_PREFIX}/share/pkgconfig"
   )
 
@@ -123,6 +125,7 @@ SETA(CPACK_RPM_server_PACKAGE_OBSOLETES
   "MySQL"
   "mysql-server"
   "MySQL-server"
+  "MariaDB-Galera-server"
   "MySQL-OurDelta-server")
 SETA(CPACK_RPM_server_PACKAGE_PROVIDES
   "MariaDB"
@@ -176,7 +179,7 @@ MACRO(ALTERNATIVE_NAME real alt)
   SET(p "CPACK_RPM_${real}_PACKAGE_PROVIDES")
   SET(${p} "${${p}} ${alt} = ${ver} ${alt}%{?_isa} = ${ver} config(${alt}) = ${ver}")
   SET(o "CPACK_RPM_${real}_PACKAGE_OBSOLETES")
-  SET(${o} "${${o}} ${alt} ${alt}%{_isa}")
+  SET(${o} "${${o}} ${alt} ${alt}%{?_isa}")
 ENDMACRO(ALTERNATIVE_NAME)
 
 ALTERNATIVE_NAME("devel"  "mysql-devel")

debian/additions/innotop/innotop

@@ -1503,7 +1503,7 @@ my %exprs = (
 
 my %columns = (
    active_secs                 => { hdr => 'SecsActive',          num => 1, label => 'Seconds transaction has been active', },
-   add_pool_alloc              => { hdr => 'Add\'l Pool',         num => 1, label => 'Additonal pool allocated' },
+   add_pool_alloc              => { hdr => 'Add\'l Pool',         num => 1, label => 'Additional pool allocated' },
    attempted_op                => { hdr => 'Action',              num => 0, label => 'The action that caused the error' },
    awe_mem_alloc               => { hdr => 'AWE Memory',          num => 1, label => '[Windows] AWE memory allocated' },
    binlog_cache_overflow       => { hdr => 'Binlog Cache',        num => 1, label => 'Transactions too big for binlog cache that went to disk' },
@@ -10365,7 +10365,7 @@ show you something like this:
  pages_modified     Dirty Pages  Pages modified (dirty  IB_bp_pages_m
  buf_pool_hit_rate  Hit Rate     Buffer pool hit rate   IB_bp_buf_poo
  total_mem_alloc    Memory       Total memory allocate  IB_bp_total_m
- add_pool_alloc     Add'l Pool   Additonal pool alloca  IB_bp_add_poo
+ add_pool_alloc     Add'l Pool   Additional pool alloca  IB_bp_add_poo
 
 The first line shows which table you're editing, and reminds you again to press
 '?' for a list of key mappings.  The rest is a tabular representation of the

debian/additions/innotop/innotop.1

@@ -1579,7 +1579,7 @@ show you something like this:
 \& pages_modified     Dirty Pages  Pages modified (dirty  IB_bp_pages_m
 \& buf_pool_hit_rate  Hit Rate     Buffer pool hit rate   IB_bp_buf_poo
 \& total_mem_alloc    Memory       Total memory allocate  IB_bp_total_m
-\& add_pool_alloc     Add\*(Aql Pool   Additonal pool alloca  IB_bp_add_poo
+\& add_pool_alloc     Add\*(Aql Pool   Additional pool alloca  IB_bp_add_poo
 .Ve
 .PP
 The first line shows which table you're editing, and reminds you again to press

debian/additions/mysqlreport

@@ -366,7 +366,7 @@ sub read_relative_infiles
 
             # The infile must begin with the system variable values.
             # Therefore, the first occurance of Aborted_clients indicates the beginning
-            # of the first set of status values if no sets have occured yet ($stat_n == 0).
+            # of the first set of status values if no sets have occurred yet ($stat_n == 0).
             # In this case, the following status values are printed to the current fh,
             # along with the system variable values read thus far, until Aborted_clients
             # occurs again. Then begins the second and subsequent sets of status values.

debian/copyright

@@ -9,7 +9,7 @@ The MariaDB packages were initally made by http://ourdelta.org/, and
 are now managed by the MariaDB development team,
 maria-developers@lists.launchpad.net
 
-MariaDB can be downloaded from http://downloads.askmonty.org/mariadb/
+MariaDB can be downloaded from https://downloads.mariadb.org/ 
 
 Copyright:
 

debian/mariadb-server-10.1.mysql-server.logrotate

@@ -10,18 +10,11 @@
 	compress
 	sharedscripts
 	postrotate
-		test -x /usr/bin/mysqladmin || exit 0
+          test -x /usr/bin/mysqladmin || exit 0
 
-		# If this fails, check debian.conf! 
-		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
-		  # Really no mysqld or rather a missing debian-sys-maint user?
-		  # If this occurs and is not a error please report a bug.
-		  if ps cax | grep -q mysqld; then
- 		    exit 1
-		  fi 
-		else
-		  $MYADMIN flush-logs
-		fi
+          if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
+            # If this fails, check debian.conf!
+            mysqladmin --defaults-file=/etc/mysql/debian.cnf flush-logs
+          fi
 	endscript
 }

debian/mariadb-server-10.1.postinst

@@ -240,7 +240,10 @@ db_stop # in case invoke failes
 # Thus MariaDB server is started via init.d script, which in turn redirects to
 # systemctl. If we upgrade from MySQL mysql.service may be masked, which also
 # means init.d script is disabled. Unmask mysql service explicitely.
-deb-systemd-helper unmask mysql.service >/dev/null || true
+# Check first that the command exists, to avoid emitting any warning messages.
+if [ -x "$(command -v deb-systemd-helper)" ]; then
+  deb-systemd-helper unmask mysql.service > /dev/null
+fi
 
 #DEBHELPER#
 

extra/yassl/src/yassl_error.cpp

@@ -121,11 +121,11 @@ void SetErrorString(YasslError error, char* buffer)
         break; 
 
     case certificate_error :
-        strncpy(buffer, "unable to proccess cerificate", max);
+        strncpy(buffer, "unable to process cerificate", max);
         break;
 
     case privateKey_error :
-        strncpy(buffer, "unable to proccess private key, bad format", max);
+        strncpy(buffer, "unable to process private key, bad format", max);
         break;
 
     case badVersion_error :

include/my_context.h

@@ -178,7 +178,7 @@ struct mysql_async_context {
     resumed, eg. whether we woke up due to connection completed or timeout
     in mysql_real_connect_cont().
   */
-  unsigned int events_occured;
+  unsigned int events_occurred;
   /*
     This is set to the result of the whole asynchronous operation when it
     completes. It uses a union, as different calls have different return

include/mysql/service_progress_report.h

@@ -22,7 +22,7 @@
   if requested.
 
   The functions are documented at
-  http://kb.askmonty.org/en/progress-reporting#how-to-add-support-for-progress-reporting-to-a-storage-engine
+  https://mariadb.com/kb/en/progress-reporting/#how-to-add-support-for-progress-reporting-to-a-storage-engine
 */
 
 #ifdef __cplusplus

libmysql/libmysql.c

@@ -2233,7 +2233,7 @@ static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row)
 
 /*
   Read one row from network: unbuffered non-cursor fetch.
-  If last row was read, or error occured, erase this statement
+  If last row was read, or error occurred, erase this statement
   from record pointing to object unbuffered fetch is performed from.
 
   SYNOPSIS

man/mysql-test-run.pl.1

@@ -1583,7 +1583,7 @@ may fail in total, as each repetition is considered a new test case, which may i
 \fB\-\-retry\-failure=\fR\fB\fIN\fR\fR
 .sp
 When using the \fB-\-retry\fR option to retry failed tests, 
-stop when N failures have occured (default 2)\&. Setting it to 0 or 1 effectively turns off retries\&.
+stop when N failures have occurred (default 2)\&. Setting it to 0 or 1 effectively turns off retries\&.
 .RE
 .sp
 .RS 4

mysql-test/README

@@ -11,7 +11,7 @@ All tests must pass. If one or more of them fail on your system, please
 read the following manual section for instructions on how to report the
 problem:
 
-http://kb.askmonty.org/v/reporting-bugs
+https://mariadb.com/kb/en/reporting-bugs
 
 If you want to use an already running MySQL server for specific tests,
 use the --extern option to mysql-test-run. Please note that in this mode,

mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test

@@ -375,7 +375,7 @@ source include/start_slave.inc;
 CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
 CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
 CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
-CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
+CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log");
 
 connection master;
 TRUNCATE t1;

mysql-test/include/mtr_warnings.sql

@@ -133,7 +133,7 @@ INSERT INTO global_suppressions VALUES
  ("Slave: Query caused different errors on master and slave"),
  ("Slave: Table .* doesn't exist"),
  ("Slave: Table width mismatch"),
- ("Slave: The incident LOST_EVENTS occured on the master"),
+ ("Slave: The incident LOST_EVENTS occurred on the master"),
  ("Slave: Unknown error.* 1105"),
  ("Slave: Can't drop database.* database doesn't exist"),
  ("Warning:\s+One can only use the --user.*root"),

mysql-test/lib/My/SafeProcess.pm

@@ -34,7 +34,7 @@ package My::SafeProcess;
 #    will zap the "monitored process" and exit
 #  - the "monitored process" to exit, in which case it will exit
 #    itself with same exit code as the "monitored process"
-#  - the parent process to send the "shutdown" signal in wich case
+#  - the parent process to send the "shutdown" signal in which case
 #    monitor will kill the "monitored process" hard and exit
 #
 #

mysql-test/lib/v1/mtr_report.pl

@@ -306,7 +306,7 @@ ($)
 		/Slave: Query caused different errors on master and slave/ or
 		/Slave: Table .* doesn't exist/ or
 		/Slave: Table width mismatch/ or
-		/Slave: The incident LOST_EVENTS occured on the master/ or
+		/Slave: The incident LOST_EVENTS occurred on the master/ or
 		/Slave: Unknown error.* 1105/ or
 		/Slave: Can't drop database.* database doesn't exist/ or
                 /Slave SQL:.*(?:error.* \d+|Query:.*)/ or

mysql-test/mysql-test-run.pl

@@ -6183,7 +6183,7 @@ ($)
                         failures before stopping, set with the --retry-failure
                         option
   retry-failure=N       When using the --retry option to retry failed tests,
-                        stop when N failures have occured (default $opt_retry_failure)
+                        stop when N failures have occurred (default $opt_retry_failure)
   reorder               Reorder tests to get fewer server restarts
   help                  Get this help text
 

mysql-test/r/contributors.result

@@ -3,12 +3,12 @@ Name	Location	Comment
 Booking.com	http://www.booking.com	Founding member of the MariaDB Foundation
 MariaDB Corporation	https://mariadb.com	Founding member of the MariaDB Foundation
 Auttomattic	http://automattic.com	Member of the MariaDB Foundation
-Parallels	http://www.parallels.com/products/plesk	Founding member of the MariaDB Foundation
+Visma	http://visma.com	Member of the MariaDB Foundation
+Nexedi	http://www.nexedi.com	Member of the MariaDB Foundation
 Acronis	http://www.acronis.com	Member of the MariaDB Foundation
 Verkkokauppa.com	Finland	Sponsor of the MariaDB Foundation
 Webyog	Bangalore	Sponsor of the MariaDB Foundation
-Wikimedia Foundation	USA	Sponsor of the MariaDB Foundation
-Google	USA	Sponsoring parallel replication and GTID
+Google	USA	Sponsoring encryption, parallel replication and GTID
 Facebook	USA	Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc
 Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction
 Sheeri Kritzer	Boston, Mass. USA	EFF contribution for UC2006 Auction

mysql-test/r/delayed.result

@@ -379,7 +379,7 @@ SELECT * FROM t1 WHERE a=0;
 a
 # Connection con1
 # Sending:
-ALTER TABLE t1 COMMENT 'test';
+ALTER TABLE t1 MODIFY a INT UNSIGNED;;
 # Connection default
 # Wait until ALTER TABLE is blocked on table 't1'.
 INSERT DELAYED INTO t1 VALUES (3);

mysql-test/r/events_bugs.result

@@ -603,7 +603,7 @@ INSERT INTO events_test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp(
 ROLLBACK;
 END IF;
 END;|
-Sleep till the first INSERT into events_test.event_log occured
+Sleep till the first INSERT into events_test.event_log occurred
 SELECT COUNT(*) > 0 AS "Expect 1" FROM events_test.event_log;
 Expect 1
 1

mysql-test/r/index_merge_myisam.result

@@ -1595,7 +1595,7 @@ explain select * from t1 where a=10 and b=10 or c=10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index_merge	a,b,c	a,c	5,5	NULL	54	Using union(a,c); Using where
 This will switch to sort-union (intersection will be gone, too,
-thats a known limitation:
+that's a known limitation:
 set optimizer_switch='default,index_merge_union=off';
 explain select * from t1 where a=10 and b=10 or c=10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/r/mysqldump.result

@@ -1821,7 +1821,7 @@ a	b
 Osnabr�ck	K�ln
 drop table t1;
 #
-# Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
+# Bug#15328 Segmentation fault occurred if my.cnf is invalid for escape sequence
 #
 --fields-optionally-enclosed-by="
 #