summaryrefslogtreecommitdiff
path: root/sql/sql_test.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-27 11:27:04 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-27 11:27:04 +0300
commit835a75c97bbc31e35e25171db9c046ec1dae5b87 (patch)
tree857f8b9d553911f4937bee644ea5d2c3606e8e58 /sql/sql_test.cc
parentd471ad0c236d2d2ff23e75dc02e3095e5edb7f17 (diff)
downloadmariadb-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 'sql/sql_test.cc')
-rw-r--r--sql/sql_test.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index 43c24da85a2..9c458c27b95 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -21,6 +21,7 @@
#include "mysql_priv.h"
#include "sql_select.h"
#include <hash.h>
+#include <thr_alarm.h>
/* Intern key cache variables */
extern "C" pthread_mutex_t THR_LOCK_keycache;
@@ -239,6 +240,17 @@ Open streams: %10lu\n",
(ulong) cached_tables(),
(ulong) my_file_opened,
(ulong) my_stream_opened);
+
+ ALARM_INFO alarm_info;
+ thr_alarm_info(&alarm_info);
+ printf("\nAlarm status:\n\
+Active alarms: %u\n\
+Max used alarms: %u\n\
+Next alarm time: %lu\n",
+ alarm_info.active_alarms,
+ alarm_info.max_used_alarms,
+ alarm_info.next_alarm_time);
+
fflush(stdout);
if (thd)
thd->proc_info="malloc";