Changeset 1936 for trunk/tools/database/mysql

Timestamp:

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

Author:

bird

Message:

New version of MySql, v3.22.26a.

Location:

trunk/tools/database/mysql

Files:

• libmysqlclient.a (modified) ( previous)
• libmysqlclient.lib (modified) ( previous)
• mysql.h (modified) (11 diffs)
• mysql_com.h (modified) (8 diffs)
• mysql_version.h (modified) (1 diff)

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 */

trunk/tools/database/mysql/mysql_com.h

@@ -13 +13 @@
 
 #define NAME_LEN        64              /* Field/table name length */
+#define HOSTNAME_LENGTH 60
+#define USERNAME_LENGTH 16
+
 #define LOCAL_HOST      "localhost"
+#define LOCAL_HOST_NAMEDPIPE "."
 
 #define MYSQL_PORT      3306            /* Alloced by ISI for MySQL */
-#define MYSQL_UNIX_ADDR "\\socket\\mysql.sock"
+#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
+#if defined(__EMX__) || defined(__OS2__)
+#undef MYSQL_UNIX_ADDR
+#define MYSQL_OS2_ADDR "\\socket\\MySQL"
+#define MYSQL_UNIX_ADDR MYSQL_OS2_ADDR
+#endif
+#ifdef WIN32
+#define MYSQL_NAMEDPIPE "MySQL"
+#define MYSQL_SERVICENAME "MySql"
+#endif
 
 enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY,
@@ -22 +35 @@
                           COM_SHUTDOWN,COM_STATISTICS,
                           COM_PROCESS_INFO,COM_CONNECT,COM_PROCESS_KILL,
-                          COM_DEBUG};
+                          COM_DEBUG,COM_PING,COM_TIME,COM_DELAYED_INSERT};
 
 #define NOT_NULL_FLAG   1               /* Field can't be NULL */
@@ -36 +49 @@
 #define AUTO_INCREMENT_FLAG 512         /* field is a autoincrement field */
 #define TIMESTAMP_FLAG  1024            /* Field is a timestamp */
+#define SET_FLAG        2048            /* field is a set */
 #define PART_KEY_FLAG   16384           /* Intern; Part of some key */
-#define GROUP_FLAG      32768           /* Intern group field */
+#define GROUP_FLAG      32768           /* Intern: Group field */
+#define UNIQUE_FLAG     65536           /* Intern: Used by sql_yacc */
 
 #define REFRESH_GRANT           1       /* Refresh grant tables */
@@ -43 +58 @@
 #define REFRESH_TABLES          4       /* close all tables */
 #define REFRESH_HOSTS           8       /* Flush host cache */
+#define REFRESH_STATUS          16      /* Flush status variables */
 #define REFRESH_FAST            32768   /* Intern flag */
 
@@ -50 +66 @@
 #define CLIENT_CONNECT_WITH_DB  8       /* One can specify db on connect */
 #define CLIENT_NO_SCHEMA        16      /* Don't allow database.table.column */
-
-#define MYSQL_ERRMSG_SIZE 200
-#define NET_READ_TIMEOUT 30                     /* Timeout on read */
-#define NET_WRITE_TIMEOUT 60                    /* Timeout on write */
-#define NET_WAIT_TIMEOUT 8*60*60                /* Wait for new query */
+#define CLIENT_COMPRESS         32      /* Can use compression protcol */
+#define CLIENT_ODBC             64      /* Odbc client */
+#define CLIENT_LOCAL_FILES      128     /* Can use LOAD DATA LOCAL */
+#define CLIENT_IGNORE_SPACE     256     /* Ignore spaces before '(' */
+
+#define MYSQL_ERRMSG_SIZE       200
+#define NET_READ_TIMEOUT        30              /* Timeout on read */
+#define NET_WRITE_TIMEOUT       60              /* Timeout on write */
+#define NET_WAIT_TIMEOUT        8*60*60         /* Wait for new query */
+
+enum enum_net_type { NET_TYPE_TCPIP, NET_TYPE_SOCKET, NET_TYPE_NAMEDPIPE };
 
 typedef struct st_net {
-  Socket fd;
+  enum enum_net_type nettype;
+#ifdef WIN32
+  HANDLE hPipe;
+#endif
+  my_socket fd;
   int fcntl;
-  unsigned char *buff,*buff_end,*write_pos;
+  unsigned char *buff,*buff_end,*write_pos,*read_pos;
   char last_error[MYSQL_ERRMSG_SIZE];
   unsigned int last_errno,max_packet,timeout,pkt_nr;
-  my_bool error,return_errno;
+  my_bool error,return_errno,compress;
+
+  unsigned long remain_in_buf,length, buf_length, where_b;
+  my_bool more;
+  char save_char;
 } NET;
 
@@ -92 +122 @@
 
 #define net_new_transaction(net) ((net)->pkt_nr=0)
-int     my_net_init(NET *net,Socket fd);
+
+int     my_net_init(NET *net,  enum enum_net_type nettype, my_socket fd,
+                    void *);
 void    net_end(NET *net);
 void    net_clear(NET *net);
 int     net_flush(NET *net);
-int     my_net_write(NET *net,const byte *packet,unsigned int len);
-int     net_write_command(NET *net,unsigned char command,const byte *packet,
-                          unsigned int len);
-int     net_real_write(NET *net,const byte *packet,unsigned int len);
+int     my_net_write(NET *net,const char *packet,unsigned long len);
+int     net_write_command(NET *net,unsigned char command,const char *packet,
+                          unsigned long len);
+int     net_real_write(NET *net,const char *packet,unsigned long len);
 unsigned int    my_net_read(NET *net);
 
 struct rand_struct {
-  unsigned long seed,seed2,max_value;
+  unsigned long seed1,seed2,max_value;
   double max_value_dbl;
 };
@@ -117 +149 @@
   char **args;                          /* Pointer to argument */
   unsigned long *lengths;               /* Length of string arguments */
+  char *maybe_null;                     /* Set to 1 for all maybe_null args */
 } UDF_ARGS;
 
@@ -127 +160 @@
   unsigned int max_length;              /* For string functions */
   char    *ptr;                         /* free pointer for function data */
+  my_bool const_item;                   /* 0 if result is independent of arguments */
 } UDF_INIT;
 
+  /* Constants when using compression */
+#define NET_HEADER_SIZE 4               /* standard header size */
+#define COMP_HEADER_SIZE 3              /* compression header extra size */
+
   /* Prototypes to password functions */
 
-void randominit(struct rand_struct *rand,unsigned long seed1,
+void randominit(struct rand_struct *,unsigned long seed1,
                 unsigned long seed2);
-double rnd(struct rand_struct *rand);
+double rnd(struct rand_struct *);
 void make_scrambled_password(char *to,const char *password);
 void get_salt_from_password(unsigned long *res,const char *password);
 char *scramble(char *to,const char *message,const char *password,
                my_bool old_ver);
-my_bool check_scramble(const char *scramble,const char *message,
+my_bool check_scramble(const char *, const char *message,
                        unsigned long *salt,my_bool old_ver);
 char *get_tty_password(char *opt_message);
+void hash_password(unsigned long *result, const char *password);
+
+/* Some other useful functions */
+
+void my_init(void);
+void load_defaults(const char *conf_file, const char **groups,
+                   int *argc, char ***argv);
 
 #define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */
 
-#ifdef __WIN32__
+#ifdef WIN32
 #define socket_errno WSAGetLastError()
 #else

trunk/tools/database/mysql/mysql_version.h

@@ -4 +4 @@
 /* Version numbers for protocol & mysqld */
 
-#define MYSQL_SERVER_VERSION            "3.21.33b"
+#define MYSQL_SERVER_VERSION            "3.22.26a"
 #define FRM_VER                 6
-#define MYSQL_VERSION_ID        32133
+#define MYSQL_VERSION_ID        32226