summaryrefslogtreecommitdiff
path: root/client/mysql_plugin.c
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2020-06-11 22:35:30 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2020-06-11 22:35:30 +0300
commit8c67ffffe827ce07fbe55ba0fb89b82cdd9152dc (patch)
tree9e164262c9d5ec839e46be8492aad7b8187325bf /client/mysql_plugin.c
parente835881c474ec1c43ab3c24a9d4a6e2615fb3398 (diff)
parentde20091f5cee6c018da37a6f4c2c57653d369ad6 (diff)
downloadmariadb-git-8c67ffffe827ce07fbe55ba0fb89b82cdd9152dc.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'client/mysql_plugin.c')
-rw-r--r--client/mysql_plugin.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c
index 58b1608c560..a777bdbb482 100644
--- a/client/mysql_plugin.c
+++ b/client/mysql_plugin.c
@@ -1020,7 +1020,7 @@ static int find_plugin(char *tp_path)
/**
- Build the boostrap file.
+ Build the bootstrap file.
Create a new file and populate it with SQL commands to ENABLE or DISABLE
the plugin via REPLACE and DELETE operations on the mysql.plugin table.
@@ -1149,7 +1149,7 @@ exit:
Create a command line sequence to launch mysqld in bootstrap mode. This
will allow mysqld to launch a minimal server instance to read and
- execute SQL commands from a file piped in (the boostrap file). We use
+ execute SQL commands from a file piped in (the bootstrap file). We use
the --no-defaults option to skip reading values from the config file.
The bootstrap mode skips loading of plugins and many other subsystems.