diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
| commit | 38e3ae155db08ab2e9e5c267f05f89bec0542b33 (patch) | |
| tree | 7289bbef1ba3f495aa5c7cdb7d0a3f993a5bbc80 /client/mysql_upgrade.c | |
| parent | c56483d972d023105fbcb0f47af0042ee092657c (diff) | |
| parent | ed1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b (diff) | |
| download | mariadb-git-38e3ae155db08ab2e9e5c267f05f89bec0542b33.tar.gz | |
mysql-5.5 merge
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index e2c2d881654..23c969face4 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -303,10 +303,9 @@ get_one_option(int optid, const struct my_option *opt, opt_verbose= 0; add_option= 0; break; - case 's': - add_option= 0; - break; case 'f': /* --force */ + case 's': /* --upgrade-system-tables */ + case OPT_WRITE_BINLOG: /* --write-binlog */ add_option= FALSE; break; |