summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-10-16 01:11:42 +0400
committerKonstantin Osipov <kostja@sun.com>2009-10-16 01:11:42 +0400
commit88f7de578b96e5d40e6292319f4d9b34e8c6a464 (patch)
treed9065df5406f4fe7eb128aaf2f38d22e60b77dd4 /sql-common
parent16218fe5b0132fb66fd22ba299cf9b2f08e3ecd5 (diff)
downloadmariadb-git-88f7de578b96e5d40e6292319f4d9b34e8c6a464.tar.gz
Backport of:
------------------------------------------------------------ revno: 2476.657.208 committer: anozdrin/alik@station. timestamp: Tue 2007-12-04 17:22:53 +0300 message: Remove rpl_probe, enable_rpl_parse and disable_rpl_parse commands from mysqltest, the corresponding funtctions have been removed from MySQL C API
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 6a67de3b501..8ebd38178fa 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1181,7 +1181,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME));
break;
- case 26: /* ssl_cipher */
+ case 23: /* ssl_cipher */
my_free(options->ssl_cipher, MYF(MY_ALLOW_ZERO_PTR));
options->ssl_cipher= my_strdup(opt_arg, MYF(MY_WME));
break;
@@ -1190,7 +1190,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
case 14:
case 15:
case 16:
- case 26:
+ case 23:
break;
#endif /* HAVE_OPENSSL */
case 17: /* charset-lib */