diff options
| -rw-r--r-- | client/Makefile.am | 2 | ||||
| -rw-r--r-- | client/ssl_test.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 92c46519275..cead290f446 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -22,7 +22,7 @@ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen -noinst_PROGRAMS = insert_test select_test thread_test +noinst_PROGRAMS = insert_test select_test thread_test ssl_test noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ client_priv.h mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc diff --git a/client/ssl_test.c b/client/ssl_test.c index 279c1e95fdc..b18e493c267 100644 --- a/client/ssl_test.c +++ b/client/ssl_test.c @@ -41,7 +41,9 @@ int main(int argc, char **argv) mysql_init(&mysql); #ifdef HAVE_OPENSSL - mysql_ssl_set(&mysql,"../SSL/MySQL-client-key.pem","../SSL/MySQL-client-cert.pem","../SSL/MySQL-ca-cert.pem","../SSL/"); + mysql_ssl_set(&mysql,"../SSL/MySQL-client-key.pem", + "../SSL/MySQL-client-cert.pem", + "../SSL/MySQL-ca-cert.pem", 0, 0); #endif if (!(sock = mysql_real_connect(&mysql,"127.0.0.1",0,0,argv[1],3306,NULL,0))) { @@ -49,7 +51,6 @@ int main(int argc, char **argv) perror(""); exit(1); } - printf("Cipher:%s\n",mysql_ssl_cipher(&mysql)); count = 0; num = atoi(argv[2]); while (count < num) @@ -62,7 +63,7 @@ int main(int argc, char **argv) } if (!(res=mysql_store_result(sock))) { - fprintf(stderr,"Couldn't get result from query failed\n", + fprintf(stderr,"Couldn't get result from query failed (%s)\n", mysql_error(sock)); exit(1); } |