← Back to branch summary

~drizzle-trunk/libdrizzle/jenkins-Libdrizzle-29

« back to all changes in this revision

Viewing changes to libdrizzle-5.0/drizzle_client.h

  • Committer: Andrew Hutchings
  • Date: 2012-12-22 08:55:58 UTC
  • mfrom: (43.2.18 5.0)
  • Revision ID: andrew@linuxjedi.co.uk-20121222085558-b3aj47q2ah3cfccg
Merge 5.0 into 5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-5.0/drizzle_client.h
82
82
 * @param[in] password Password to use while establishing the connection.
83
83
 * @param[in] db Initial database to connect to.
84
84
 * @param[in] options Drizzle connection options to add.
85
 
 * @return Same return as drizzle_con_create().
 
85
 * @return Same return as drizzle_create().
86
86
 */
87
87
DRIZZLE_API
88
 
drizzle_con_st *drizzle_con_create_tcp(const char *host, in_port_t port,
 
88
drizzle_st *drizzle_create_tcp(const char *host, in_port_t port,
89
89
                                    const char *user, const char *password,
90
90
                                    const char *db,
91
 
                                    drizzle_con_options_t options);
 
91
                                    drizzle_options_t options);
92
92
 
93
93
/**
94
94
 * Add unix domain socket connection with common arguments.
98
98
 * @param[in] password Password to use while establishing the connection.
99
99
 * @param[in] db Initial database to connect to.
100
100
 * @param[in] options Drizzle connection options to add.
101
 
 * @return Same return as drizzle_con_create().
 
101
 * @return Same return as drizzle_create().
102
102
 */
103
103
DRIZZLE_API
104
 
drizzle_con_st *drizzle_con_create_uds(const char *uds, const char *user,
 
104
drizzle_st *drizzle_create_uds(const char *uds, const char *user,
105
105
                                    const char *password, const char *db,
106
 
                                    drizzle_con_options_t options);
 
106
                                    drizzle_options_t options);
107
107
 
108
108
/** @} */
109
109