diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-11 09:11:36 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-11 09:11:36 +0200 |
| commit | bb90de39c0693ec5793e1557de105a7aa566deb7 (patch) | |
| tree | 250fa4de80754cf9f63a1956c34e9cd17e8ee3b1 /include | |
| parent | 0957814dc51ba3fbe141603770d8b4eb09c4db38 (diff) | |
| parent | 9f6497489110d047ac09a995e7d68878afea5482 (diff) | |
| download | mariadb-git-bb90de39c0693ec5793e1557de105a7aa566deb7.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 925a4525378..6217ce631b5 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -409,6 +409,7 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql); my_bool STDCALL mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher); +const char * STDCALL mysql_get_ssl_cipher(MYSQL *mysql); my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db); MYSQL * STDCALL mysql_real_connect(MYSQL *mysql, const char *host, |