Changeset 1936 for trunk/tools/database/mysql/mysql.h

Timestamp:

Dec 2, 1999, 2:06:05 PM (26 years ago)

Author:

bird

Message:

New version of MySql, v3.22.26a.

File:

• trunk/tools/database/mysql/mysql.h (modified) (11 diffs)

trunk/tools/database/mysql/mysql.h

@@ -13 +13 @@
 #include <sys/types.h>
 typedef char my_bool;
-#if !defined(__WIN32__) && !defined(WIN32)
+#if !defined(WIN32)
 #define STDCALL
-typedef char byte;
 #else
 #define STDCALL __stdcall
@@ -37 +36 @@
 #endif
 
-#ifndef Socket_defined
-#ifdef __WIN32__
-#define Socket SOCKET
-#else
-typedef int Socket;
+#ifndef my_socket_defined
+#ifdef WIN32
+#define my_socket SOCKET
+#else
+typedef int my_socket;
 #endif
 #endif
@@ -67 +66 @@
 } MYSQL_FIELD;
 
-typedef byte **MYSQL_ROW;               /* return data as array of strings */
+typedef char **MYSQL_ROW;               /* return data as array of strings */
 typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
+
+#if defined(NO_CLIENT_LONG_LONG)
+typedef unsigned long my_ulonglong;
+#elif defined (WIN32)
+typedef unsigned __int64 my_ulonglong;
+#else
+typedef unsigned long long my_ulonglong;
+#endif
+
+#define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)
 
 typedef struct st_mysql_rows {
@@ -78 +87 @@
 
 typedef struct st_mysql_data {
-  unsigned int rows;
+  my_ulonglong rows;
   unsigned int fields;
   MYSQL_ROWS *data;
   MEM_ROOT alloc;
 } MYSQL_DATA;
+
+struct st_mysql_options {
+  unsigned int connect_timeout,client_flag;
+  my_bool compress,named_pipe;
+  unsigned int port;
+  char *host,*init_command,*user,*password,*unix_socket,*db;
+  char *my_cnf_file,*my_cnf_group;
+};
+
+enum mysql_option { MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS,
+                    MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND,
+                    MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP };
 
 enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
@@ -95 +116 @@
   unsigned int  field_count;
   unsigned long thread_id;              /* Id for connection in server */
-  unsigned long affected_rows;
-  unsigned long insert_id;              /* id if insert on table with NEXTNR */
-  unsigned long extra_info;             /* Used by mysqlshow */
+  my_ulonglong affected_rows;
+  my_ulonglong insert_id;               /* id if insert on table with NEXTNR */
+  my_ulonglong extra_info;              /* Used by mysqlshow */
+  unsigned long packet_length;
   enum mysql_status status;
   MYSQL_FIELD   *fields;
@@ -103 +125 @@
   my_bool       free_me;                /* If free in mysql_close */
   my_bool       reconnect;              /* set to 1 if automatic reconnect */
+  struct st_mysql_options options;
 } MYSQL;
 
 
 typedef struct st_mysql_res {
-  unsigned long row_count;
+  my_ulonglong row_count;
   unsigned int  field_count, current_field;
   MYSQL_FIELD   *fields;
@@ -115 +138 @@
   MYSQL_ROW     row;                    /* If unbuffered read */
   MYSQL_ROW     current_row;            /* buffer to current row */
-  unsigned int  *lengths;               /* column lengths of current row */
+  unsigned long *lengths;               /* column lengths of current row */
   MYSQL         *handle;                /* for unbuffered reads */
   my_bool       eof;                    /* Used my mysql_fetch_row */
@@ -124 +147 @@
 #define mysql_num_fields(res) (res)->field_count
 #define mysql_eof(res) (res)->eof
-#define mysql_fetch_field_direct(res,fieldnr) ((res)->fields[fieldnr])
+#define mysql_fetch_field_direct(res,fieldnr) (&(res)->fields[fieldnr])
 #define mysql_fetch_fields(res) (res)->fields
 #define mysql_row_tell(res) (res)->data_cursor
 #define mysql_field_tell(res) (res)->current_field
 
+#define mysql_field_count(mysql) (mysql)->field_count
 #define mysql_affected_rows(mysql) (mysql)->affected_rows
 #define mysql_insert_id(mysql) (mysql)->insert_id
@@ -137 +161 @@
 #define mysql_thread_id(mysql) (mysql)->thread_id
 
-  /* void               STDCALL mysql_init(MYSQL *mysql); */
+MYSQL *         STDCALL mysql_init(MYSQL *mysql);
 MYSQL *         STDCALL mysql_connect(MYSQL *mysql, const char *host,
                                       const char *user, const char *passwd);
@@ -168 +192 @@
                                      unsigned int refresh_options);
 int             STDCALL mysql_kill(MYSQL *mysql,unsigned long pid);
+int             STDCALL mysql_ping(MYSQL *mysql);
 char *          STDCALL mysql_stat(MYSQL *mysql);
 char *          STDCALL mysql_get_server_info(MYSQL *mysql);
@@ -180 +205 @@
 MYSQL_RES *     STDCALL mysql_store_result(MYSQL *mysql);
 MYSQL_RES *     STDCALL mysql_use_result(MYSQL *mysql);
+int             STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
+                                      const char *arg);
 void            STDCALL mysql_free_result(MYSQL_RES *result);
-void            STDCALL mysql_data_seek(MYSQL_RES *mysql,unsigned int offset);
-MYSQL_ROW_OFFSET STDCALL mysql_row_seek(MYSQL_RES *mysql, MYSQL_ROW_OFFSET);
-MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *mysql,
+void            STDCALL mysql_data_seek(MYSQL_RES *result,unsigned int offset);
+MYSQL_ROW_OFFSET STDCALL mysql_row_seek(MYSQL_RES *result, MYSQL_ROW_OFFSET);
+MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *result,
                                            MYSQL_FIELD_OFFSET offset);
-MYSQL_ROW       STDCALL mysql_fetch_row(MYSQL_RES *mysql);
-unsigned int *  STDCALL mysql_fetch_lengths(MYSQL_RES *mysql);
-MYSQL_FIELD *   STDCALL mysql_fetch_field(MYSQL_RES *handle);
+MYSQL_ROW       STDCALL mysql_fetch_row(MYSQL_RES *result);
+unsigned long * STDCALL mysql_fetch_lengths(MYSQL_RES *result);
+MYSQL_FIELD *   STDCALL mysql_fetch_field(MYSQL_RES *result);
 unsigned int    STDCALL mysql_escape_string(char *to,const char *from,
                                             unsigned int from_length);
-void            STDCALL mysql_debug(char *debug);
+void            STDCALL mysql_debug(const char *debug);
 
 /* new api functions */