diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 12:49:19 +0200 |
| commit | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (patch) | |
| tree | 42c96cf95d5df2950b77329c76c0024f33088aff /client/mysql_upgrade.c | |
| parent | e6f95b23f425001a14a528256354e0faf4e272f6 (diff) | |
| parent | 440d4b282dd4992d64abdd6289859598db7e5f75 (diff) | |
| download | mariadb-git-09a1f0075a8d5752dd7b2940a20d86a040af1741.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 63fec217433..666947d7b6c 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -18,7 +18,7 @@ #include "client_priv.h" #include <sslopt-vars.h> -#include "../scripts/mysql_fix_privilege_tables_sql.c" +#include <../scripts/mysql_fix_privilege_tables_sql.c> #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ @@ -1182,7 +1182,7 @@ static int check_version_match(void) extract_variable_from_show(&ds_version, version_str)) { print_error("Version check failed. Got the following error when calling " - "the 'mysql_upgrade' command line client", &ds_version); + "the 'mysql' command line client", &ds_version); dynstr_free(&ds_version); return 1; /* Query failed */ } |