diff options
author | unknown <monty@hundin.mysql.fi> | 2002-06-27 11:27:04 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-06-27 11:27:04 +0300 |
commit | 835a75c97bbc31e35e25171db9c046ec1dae5b87 (patch) | |
tree | 857f8b9d553911f4937bee644ea5d2c3606e8e58 /include | |
parent | d471ad0c236d2d2ff23e75dc02e3095e5edb7f17 (diff) | |
download | mariadb-git-835a75c97bbc31e35e25171db9c046ec1dae5b87.tar.gz |
Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.
Docs/manual.texi:
Changelog and TODO
include/mysql.h:
Removed mysql_ssl_clear() (One should use mysql_close() instead)
include/thr_alarm.h:
Added info for alarms
libmysql/libmysql.c:
Made mysql_ssl_clear() static
libmysql/libmysql.def:
cleanup
libmysqld/libmysqld.def:
cleanup
myisam/myisamchk.c:
describe -> description
myisam/myisampack.c:
Fixed copyright.
mysys/thr_alarm.c:
Added statistics information for alarms (for bug tracking)
scripts/Makefile.am:
Added mysql_table_info
sql-bench/crash-me.sh:
Don't store "incomplete" in the xxx.cfg file if we are not using --restart.
This was done becasue "incomplete" made it harder to quickly repeat a test that
failed.
sql-bench/limits/mysql.cfg:
Update to 1.58
sql/hostname.cc:
Remved compiler warning
sql/item_func.cc:
cleanup
sql/item_func.h:
Cleanup
sql/mysql_priv.h:
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
sql/opt_range.cc:
Removed purify warning
sql/sql_parse.cc:
cleanup
sql/sql_test.cc:
Added ala
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql.h | 41 | ||||
-rw-r--r-- | include/thr_alarm.h | 9 |
2 files changed, 33 insertions, 17 deletions
diff --git a/include/mysql.h b/include/mysql.h index 5bcdca636c0..af3e8c773ef 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -122,17 +122,17 @@ struct st_mysql_options { my_bool use_ssl; /* if to use SSL or not */ my_bool compress,named_pipe; /* - on connect, find out the replication role of the server, and + On connect, find out the replication role of the server, and establish connections to all the peers */ my_bool rpl_probe; - /* - each call to mysql_real_query() will parse it to tell if it is a read - or a write, and direct it to the slave or the master + /* + Each call to mysql_real_query() will parse it to tell if it is a read + or a write, and direct it to the slave or the master */ my_bool rpl_parse; /* - if set, never read from a master,only from slave, when doing + If set, never read from a master,only from slave, when doing a read that is replication-aware */ my_bool no_master_reads; @@ -185,8 +185,10 @@ typedef struct st_mysql { added though mysql_rpl_probe() or mysql_set_master()/ mysql_add_slave() */ my_bool rpl_pivot; - /* pointers to the master, and the next slave - connections, points to itself if lone connection */ + /* + Pointers to the master, and the next slave connections, points to + itself if lone connection. + */ struct st_mysql* master, *next_slave; struct st_mysql* last_used_slave; /* needed for round-robin slave pick */ @@ -234,21 +236,27 @@ typedef struct st_mysql_manager 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. */ +/* + 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. +*/ int STDCALL mysql_server_init(int argc, char **argv, char **groups); void STDCALL mysql_server_end(void); -/* Set up and bring down a thread; these function should be called - * for each thread in an application which opens at least one MySQL - * connection. All uses of the connection(s) should be between these - * function calls. */ +/* + Set up and bring down a thread; these function should be called + for each thread in an application which opens at least one MySQL + connection. All uses of the connection(s) should be between these + function calls. +*/ my_bool STDCALL mysql_thread_init(void); void STDCALL mysql_thread_end(void); -/* Functions to get information from the MYSQL and MYSQL_RES structures */ -/* Should definitely be used if one uses shared libraries */ +/* + Functions to get information from the MYSQL and MYSQL_RES structures + Should definitely be used if one uses shared libraries. +*/ my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res); unsigned int STDCALL mysql_num_fields(MYSQL_RES *res); @@ -272,7 +280,6 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql); int STDCALL mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher); -int STDCALL mysql_ssl_clear(MYSQL *mysql); my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db); MYSQL * STDCALL mysql_real_connect(MYSQL *mysql, const char *host, diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 5caf552718c..30825d49158 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -38,6 +38,15 @@ extern "C" { #define THR_SERVER_ALARM SIGALRM #endif +typedef struct st_alarm_info +{ + ulong next_alarm_time; + uint active_alarms; + uint max_used_alarms; +} ALARM_INFO; + +void thr_alarm_info(ALARM_INFO *info); + #if defined(DONT_USE_THR_ALARM) || !defined(THREAD) #define USE_ALARM_THREAD |