← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to include/sql_common.h

Merged from Patrick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/sql_common.h
23
23
#endif
24
24
 
25
25
extern CHARSET_INFO *default_client_charset_info;
26
 
MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
 
26
DRIZZLE_FIELD *unpack_fields(DRIZZLE_DATA *data,MEM_ROOT *alloc,uint fields,
27
27
                           my_bool default_value, uint server_capabilities);
28
 
void free_rows(MYSQL_DATA *cur);
29
 
void free_old_query(MYSQL *mysql);
30
 
void end_server(MYSQL *mysql);
31
 
my_bool mysql_reconnect(MYSQL *mysql);
32
 
void mysql_read_default_options(struct st_mysql_options *options,
 
28
void free_rows(DRIZZLE_DATA *cur);
 
29
void free_old_query(DRIZZLE *drizzle);
 
30
void end_server(DRIZZLE *drizzle);
 
31
my_bool drizzle_reconnect(DRIZZLE *drizzle);
 
32
void drizzle_read_default_options(struct st_drizzle_options *options,
33
33
                                const char *filename,const char *group);
34
34
bool
35
 
cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
 
35
cli_advanced_command(DRIZZLE *drizzle, enum enum_server_command command,
36
36
                     const unsigned char *header, uint32_t header_length,
37
37
                     const unsigned char *arg, uint32_t arg_length, bool skip_check);
38
 
uint32_t cli_safe_read(MYSQL *mysql);
 
38
uint32_t cli_safe_read(DRIZZLE *drizzle);
39
39
void net_clear_error(NET *net);
40
 
void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);
 
40
void set_drizzle_error(DRIZZLE *drizzle, int errcode, const char *sqlstate);
41
41
#ifdef  __cplusplus
42
42
}
43
43
#endif