Merge branch '10.3' into bb-10.4-release

Author: sanja-byelkin

BUILD/SETUP.sh

@@ -121,7 +121,7 @@ get_make_parallel_flag
 
 # SSL library to use.--with-ssl will select our bundled yaSSL
 # implementation of SSL. --with-ssl=yes will first try system library
-# then the boundled one --with-ssl=system will use the system library.
+# then the bundled one --with-ssl=system will use the system library.
 # We use bundled by default as this is guaranteed to work with Galera
 SSL_LIBRARY=--with-ssl
 

BUILD/compile-irix-mips64-mipspro

@@ -55,7 +55,7 @@ path=`dirname $0`
 . "$path/autorun.sh"
 
 # C options:
-# -apo - auto-parallize for multiprocessors (implies -mp)
+# -apo - auto-parallelize for multiprocessors (implies -mp)
 # -mp - generate multiprocessor code
 # These two common optimization options apparently use 'sproc' model of
 # threading, which is not compatible with PTHREADS: don't add them unless you

Docs/INSTALL-BINARY

@@ -44,8 +44,8 @@ However most documentation at www.mysql.com also applies.
 shell> groupadd mysql
 shell> useradd -g mysql mysql
 shell> cd /usr/local
-shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
-shell> ln -s full-path-to-mysql-VERSION-OS mysql
+shell> gunzip < /path/to/mariadb-VERSION-OS.tar.gz | tar xvf -
+shell> ln -s full-path-to-mariadb-VERSION-OS mysql
 shell> cd mysql
 shell> chown -R mysql .
 shell> chgrp -R mysql .
@@ -88,16 +88,16 @@ shell> cd /usr/local
 
  4. Unpack the distribution, which creates the installation
  directory. Then create a symbolic link to that directory:
-shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
-shell> ln -s full-path-to-mysql-VERSION-OS mysql
- The tar command creates a directory named mysql-VERSION-OS.
+shell> gunzip < /path/to/mariadb-VERSION-OS.tar.gz | tar xvf -
+shell> ln -s full-path-to-mariadb-VERSION-OS mysql
+ The tar command creates a directory named mariadb-VERSION-OS.
  The ln command makes a symbolic link to that directory. This
  lets you refer more easily to the installation directory as
  /usr/local/mysql.
  With GNU tar, no separate invocation of gunzip is necessary.
  You can replace the first line with the following alternative
  command to uncompress and extract the distribution:
-shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
+shell> tar zxvf /path/to/mariadb-VERSION-OS.tar.gz
 
  5. Change location into the installation directory:
 shell> cd mysql

client/echo.c

@@ -16,7 +16,7 @@
 
 /*
  echo is a replacement for the "echo" command builtin to cmd.exe
- on Windows, to get a Unix eqvivalent behaviour when running commands
+ on Windows, to get a Unix equivalent behaviour when running commands
  like:
  $> echo "hello" | mysql
 

client/mysql.cc

@@ -2331,7 +2331,7 @@ static bool add_line(String &buffer, char *line, size_t line_length,
  !(*in_string &&
  (mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)))
  {
- // Found possbile one character command like \c
+ // Found possible one character command like \c
 
  /*
  The null-terminating character (ASCII '\0') marks the end of user

client/mysql_plugin.c

@@ -281,7 +281,7 @@ static char *convert_path(const char *argument)
 
  @param[in] path The Windows path to examine.
 
- @returns string containing excaped quotes if spaces found in path
+ @returns string containing escaped quotes if spaces found in path
 */
 static char *add_quotes(const char *path)
 {

client/mysql_upgrade.c

@@ -696,7 +696,7 @@ static char upgrade_info_file[FN_REFLEN]= {0};
  Open or create mysql_upgrade_info file in servers data dir.
 
  Take a lock to ensure there cannot be any other mysql_upgrades
- runninc concurrently
+ running concurrently
 */
 
 const char *create_error_message=
@@ -757,7 +757,7 @@ static void open_mysql_upgrade_file()
 /**
  Place holder for versions that require a major upgrade
 
- @return 0 upgrade has alredy been run on this version
+ @return 0 upgrade has already been run on this version
  @return 1 upgrade has to be run
 
 */
@@ -781,7 +781,7 @@ static int faulty_server_versions(const char *version)
  file it's always better to report that the upgrade hasn't
  been performed.
 
- @return 0 Upgrade has alredy been run on this version
+ @return 0 Upgrade has already been run on this version
  @return > 0 Upgrade has to be run
 */
 

client/mysqladmin.cc

@@ -15,7 +15,7 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
-/* maintaince of mysql databases */
+/* maintenance of mysql databases */
 
 #include "client_priv.h"
 #include <signal.h>

client/mysqlbinlog.cc

@@ -174,7 +174,7 @@ enum Exit_status {
 
 /**
  Pointer to the last read Annotate_rows_log_event. Having read an
- Annotate_rows event, we should not print it immediatedly because all
+ Annotate_rows event, we should not print it immediately because all
  subsequent rbr events can be filtered away, and have to keep it for a while.
  Also because of that when reading a remote Annotate event we have to keep
  its binary log representation in a separately allocated buffer.

client/mysqlcheck.c

@@ -914,7 +914,7 @@ static int handle_request_for_tables(char *tables, size_t length,
  case DO_ANALYZE:
  if (view)
  {
- printf("%-50s %s\n", tables, "Can't run anaylyze on a view");
+ printf("%-50s %s\n", tables, "Can't run analyze on a view");
  DBUG_RETURN(1);
  }
  DBUG_ASSERT(!view);