diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /client/mysql_upgrade.c | |
parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 2e6e8030f34..cdeaebf478f 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -658,7 +658,7 @@ static int get_upgrade_info_file_name(char* name) /* Read the content of mysql_upgrade_info file and compare the version number form file against - version number wich mysql_upgrade was compiled for + version number which mysql_upgrade was compiled for NOTE This is an optimization to avoid running mysql_upgrade |