summaryrefslogtreecommitdiff
path: root/man/mysql.1
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-13 11:38:21 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-13 11:38:21 +0300
commit4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (patch)
treec8b327da16aa30bc5a26bfa31a2563af1c6f4976 /man/mysql.1
parentff77a09bda884fe6bf3917eb29b9d3a2f53f919b (diff)
parent2bb8d7c2f36439ab6a3944476665eb1218c36f5c (diff)
downloadmariadb-git-4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'man/mysql.1')
-rw-r--r--man/mysql.19
1 files changed, 8 insertions, 1 deletions
diff --git a/man/mysql.1 b/man/mysql.1
index 888deb78711..3ae8fdf9d69 100644
--- a/man/mysql.1
+++ b/man/mysql.1
@@ -206,7 +206,14 @@ option\&.
.\" binary-mode option: mysql
\fB\-\-binary\-mode\fR
.sp
-By default, ASCII '\e0' is disallowed and '\er\en' is translated to '\en'\&. This switch turns off both features, and also turns off parsing of all client commands except \eC and DELIMITER, in non-interactive mode (for input piped to mysql or loaded using the 'source' command)\&. This is necessary when processing output from mysqlbinlog that may contain blobs\&.
+Binary mode allows certain character sequences to be processed as data that
+would otherwise be treated with a special meaning by the parser\&.
+Specifically, this switch turns off parsing of all client commands except \eC
+and DELIMITER in non-interactive mode (i\&.e\&., when binary mode is combined
+with either 1) piped input, 2) the --batch mysql option, or 3) the 'source'
+command)\&. Also, in binary mode, occurrences of '\er\en' and ASCII '\e0' are
+preserved within strings, whereas by default, '\er\en' is translated to '\en'
+and '\e0' is disallowed in user input\&.
.RE
.sp
.RS 4