diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
| commit | 624dd71b9419555eca8baadc695e3376de72286f (patch) | |
| tree | 31aaab8aeac43f921638407ab82190dd05a72793 /client/mysql_upgrade.c | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 59ec622ad8c..39fe715bdff 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -173,6 +173,7 @@ static const char *load_default_groups[]= { "client", /* Read settings how to connect to server */ "mysql_upgrade", /* Read special settings for mysql_upgrade */ + "mariadb-upgrade", /* Read special settings for mysql_upgrade */ "client-server", /* Reads settings common between client & server */ "client-mariadb", /* Read mariadb unique client settings */ 0 |