diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-09-19 14:30:43 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-09-19 14:30:43 -0600 |
| commit | ba2c3fcd6a4eacd1c09fbebd823c0efdeefeedac (patch) | |
| tree | 7d9a51529a16431dfa1dffbe7b1ddc566da2de85 /include/mysql.h | |
| parent | 623a6e551afaebc3038c29f2bcee930d2db7375e (diff) | |
| download | mariadb-git-ba2c3fcd6a4eacd1c09fbebd823c0efdeefeedac.tar.gz | |
fixes for MYSQL manager
mysys/md5.c:
Rename: sql/md5.c -> mysys/md5.c
include/md5.h:
Rename: mysys/md5.h -> include/md5.h
client/Makefile.am:
added mysqlmanagerc
include/Makefile.am:
moved md5.h to include
include/mysql.h:
added mysqlmanager client code
include/mysql_com.h:
renamed connect2 to my_connect() and made it extern
libmysql/Makefile.shared:
added md5 to libmysqlclient
libmysql/libmysql.c:
connect2->my_connect
mysys/Makefile.am:
added md5 to client
sql/Makefile.am:
md5 -> mysys
sql/handler.cc:
fixed typo
tools/managertest1.nc:
cleanup
tools/mysqlmanager.c:
fixed bugs
added md5 authentication
BitKeeper/etc/ignore:
Added client/mysqlmanagerc to the ignore list
vio/test-ssl:
no change
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 7db907fb0f3..44dfe9c2f6a 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -220,7 +220,31 @@ typedef struct st_mysql_res { my_bool eof; /* Used my mysql_fetch_row */ } MYSQL_RES; +#define MAX_MYSQL_MANAGER_ERR 256 +#define MAX_MYSQL_MANAGER_MSG 256 +#define MANAGER_OK 200 +#define MANAGER_INFO 250 +#define MANAGER_ACCESS 401 +#define MANAGER_CLIENT_ERR 450 +#define MANAGER_INTERNAL_ERR 500 + + + +typedef struct st_mysql_manager +{ + Vio* vio; + char *host,*user,*passwd; + unsigned int port; + my_bool free_me; + my_bool eof; + int cmd_status; + int last_errno; + char* net_buf,*net_buf_pos,*net_data_end; + int net_buf_size; + char last_error[MAX_MYSQL_MANAGER_ERR]; +} MYSQL_MANAGER; + /* Set up and bring down the server; to ensure that applications will * work when linked against either the standard client library or the * embedded server library, these functions should be called. */ @@ -365,7 +389,18 @@ char * STDCALL mysql_odbc_escape_string(MYSQL *mysql, unsigned long *length)); void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name); unsigned int STDCALL mysql_thread_safe(void); - +MYSQL_MANAGER* STDCALL mysql_manager_init(MYSQL_MANAGER* con); +MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con, + const char* host, + const char* user, + const char* passwd, + unsigned int port); +void STDCALL mysql_manager_close(MYSQL_MANAGER* con); +int STDCALL mysql_manager_command(MYSQL_MANAGER* con, + const char* cmd, int cmd_len); +int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con, + char* res_buf, + int res_buf_size); #define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT) #ifdef USE_OLD_FUNCTIONS |