database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

mysql-5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-01-16 20:16:35 +01:00
parent c56483d972 ed1ba992c1
commit 38e3ae155d
321 changed files with 5432 additions and 3995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql_upgrade.c
View File

@ -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;