Merge bk://localhost:5559

into  production.mysql.com:/usersnfs/jamppa/mysql-4.0


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2007-01-30 17:52:27 +01:00
commit 7be3cad45d
3 changed files with 7 additions and 0 deletions

View file

@ -683,6 +683,7 @@ extern pthread_t shutdown_th, main_th, signal_th;
#define THD_LIB_LT 4
extern uint thd_lib_detected;
extern uint thr_client_alarm;
/* statistics_xxx functions are for not essential statistic */