← Back to branch summary

~maria-captains/mariadb-native-client/trunk

« back to all changes in this revision

Viewing changes to include/mysql.h

  • Committer: Georg Richter
  • Date: 2012-11-26 07:32:41 UTC
  • Revision ID: georg@linux-eozo-20121126073241-ues51lp2vo9td9vd
Added openssl layer support
Imported libmysql unittests
Added simple ssl tests
minor cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/mysql.h
234
234
 
235
235
typedef struct st_mysql {
236
236
  NET           net;                    /* Communication parameters */
237
 
  unsigned char *connector_fd;          /* ConnectorFd for SSL */
 
237
  unsigned char *unused;
238
238
  char          *host,*user,*passwd,*unix_socket,*server_version,*host_info;
239
239
  char          *info,*db;
240
240
  const struct charset_info_st *charset;      /* character set */
368
368
int             STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
369
369
                                      const char *cert, const char *ca,
370
370
                                      const char *capath);
371
 
char *          STDCALL mysql_ssl_cipher(MYSQL *mysql);
 
371
const char *    STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
372
372
int             STDCALL mysql_ssl_clear(MYSQL *mysql);
373
373
#endif /* HAVE_OPENSSL */
374
374
MYSQL *         STDCALL mysql_connect(MYSQL *mysql, const char *host,