diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-16 01:11:42 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-16 01:11:42 +0400 |
| commit | 3bb00f19461d2a8a277e5382fdc271f1c73318ab (patch) | |
| tree | d9065df5406f4fe7eb128aaf2f38d22e60b77dd4 /sql-common | |
| parent | ded234de1e3a3b7f012ce1794de7829f446d1c4b (diff) | |
| download | mariadb-git-3bb00f19461d2a8a277e5382fdc271f1c73318ab.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
client/mysqltest.cc:
Remove unused functions.
libmysql/CMakeLists.txt:
Remove manager.c from Windows build.
sql-common/client.c:
A post-merge fix.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
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 */ |