← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle.h

  • Committer: Monty Taylor
  • Date: 2008-09-14 01:27:06 UTC
  • mto: This revision was merged to the branch mainline in revision 387.
  • Revision ID: monty@inaugust.com-20080914012706-6q4lbtvk4fa0agmp
Removed more CHARSET_INFO stuff from libdrizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/drizzle.h
116
116
{
117
117
  DRIZZLE_OPT_CONNECT_TIMEOUT, DRIZZLE_OPT_COMPRESS, DRIZZLE_OPT_NAMED_PIPE,
118
118
  DRIZZLE_INIT_COMMAND, DRIZZLE_READ_DEFAULT_FILE, DRIZZLE_READ_DEFAULT_GROUP,
119
 
  DRIZZLE_SET_CHARSET_DIR, DRIZZLE_SET_CHARSET_NAME, DRIZZLE_OPT_LOCAL_INFILE,
 
119
  DRIZZLE_OPT_LOCAL_INFILE,
120
120
  DRIZZLE_OPT_PROTOCOL, DRIZZLE_SHARED_MEMORY_BASE_NAME, DRIZZLE_OPT_READ_TIMEOUT,
121
121
  DRIZZLE_OPT_WRITE_TIMEOUT, DRIZZLE_OPT_USE_RESULT,
122
122
  DRIZZLE_OPT_USE_REMOTE_CONNECTION,
131
131
  unsigned long client_flag;
132
132
  char *host,*user,*password,*unix_socket,*db;
133
133
  struct st_dynamic_array *init_commands;
134
 
  char *my_cnf_file,*my_cnf_group, *charset_dir, *charset_name;
 
134
  char *my_cnf_file,*my_cnf_group;
135
135
  char *ssl_key;        /* PEM key file */
136
136
  char *ssl_cert;        /* PEM cert file */
137
137
  char *ssl_ca;          /* PEM CA file */
171
171
  DRIZZLE_PROTOCOL_TCP
172
172
};
173
173
 
174
 
typedef struct character_set
175
 
{
176
 
  unsigned int      number;     /* character set number              */
177
 
  unsigned int      state;      /* character set state               */
178
 
  const char        *csname;    /* collation name                    */
179
 
  const char        *name;      /* character set name                */
180
 
  const char        *comment;   /* comment                           */
181
 
  const char        *dir;       /* character set directory           */
182
 
  unsigned int      mbminlen;   /* min. length for multibyte strings */
183
 
  unsigned int      mbmaxlen;   /* max. length for multibyte strings */
184
 
} MY_CHARSET_INFO;
185
 
 
186
174
struct st_drizzle_methods;
187
175
struct st_drizzle_stmt;
188
176
 
192
180
  unsigned char  *connector_fd;    /* ConnectorFd for SSL */
193
181
  char    *host,*user,*passwd,*unix_socket,*server_version,*host_info;
194
182
  char          *info, *db;
195
 
  const struct charset_info_st *charset;
196
183
  DRIZZLE_FIELD  *fields;
197
184
  MEM_ROOT  field_alloc;
198
185
  uint64_t affected_rows;
330
317
DRIZZLE_RES * drizzle_store_result(DRIZZLE *drizzle);
331
318
DRIZZLE_RES * drizzle_use_result(DRIZZLE *drizzle);
332
319
 
333
 
void        drizzle_get_character_set_info(const DRIZZLE *drizzle,
334
 
                                                   MY_CHARSET_INFO *charset);
335
 
 
336
320
/* local infile support */
337
321
 
338
322
#define LOCAL_INFILE_ERROR_LEN 512
373
357
DRIZZLE_RES *     drizzle_list_fields(DRIZZLE *drizzle, const char *table, const char *wild);
374
358
uint32_t  drizzle_escape_string(char *to,const char *from, uint32_t from_length);
375
359
uint32_t  drizzle_hex_string(char *to,const char *from, uint32_t from_length);
376
 
void    myodbc_remove_escape(const DRIZZLE *drizzle, char *name);
377
360
bool         drizzle_read_query_result(DRIZZLE *drizzle);
378
361
 
379
362