database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge mysql.com:/home/my/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/heap.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
mysys/my_thr_init.c:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/table.cc:
  Manual merge
This commit is contained in:
unknown
2006-11-29 23:07:15 +02:00
parent 6bcbd7df1e 42fd48da99
commit c0c013e5b7
15 changed files with 98 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_pthread.h
View File

@@ -599,14 +599,13 @@ struct st_my_thread_var
};
extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
extern uint my_thread_end_wait_time;
#define my_thread_var (_my_thread_var())
#define my_errno my_thread_var->thr_errno
/*
Keep track of shutdown,signal, and main threads so that my_end() will not
report errors with them
*/
extern pthread_t shutdown_th, main_th, signal_th;
/* statistics_xxx functions are for not essential statistic */
#ifndef thread_safe_increment