diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-09-13 00:44:50 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-09-13 00:44:50 +0500 |
commit | 5b541452a88f656b0ce8f050e38aa757d2883627 (patch) | |
tree | 7a9f1e8fbbdc8ccd07f27ec07ce8c9b540695a4f /include | |
parent | 0e1cdf8d94a35c339c935ed00b2b63597bd27d47 (diff) | |
parent | bdf0ab58bee8dcb312d5987b46109bc548b46282 (diff) | |
download | mariadb-git-5b541452a88f656b0ce8f050e38aa757d2883627.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/sp.result:
SCCS merged
mysql-test/t/sp.test:
SCCS merged
sql/sql_lex.h:
SCCS merged
sql/sql_parse.cc:
SCCS merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'include')
-rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 3041d43c773..eb390c2acc4 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -519,6 +519,7 @@ typedef struct st_my_pthread_fastmutex_t pthread_mutex_t mutex; uint spins; } my_pthread_fastmutex_t; +void fastmutex_global_init(void); int my_pthread_fastmutex_init(my_pthread_fastmutex_t *mp, const pthread_mutexattr_t *attr); |