diff options
author | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
commit | 945fa0d913a65c447306e945c44f50828903445b (patch) | |
tree | 5178630451a60c8da965c19e0c339eb4f629de2f /include/my_pthread.h | |
parent | 8526274c21ce0fd7eedac5275cb210cd2b048dc5 (diff) | |
parent | 6a1bc662d67cdb7716480654ddd63d504508b4fa (diff) | |
download | mariadb-git-945fa0d913a65c447306e945c44f50828903445b.tar.gz |
Merge with mysql-maria tree
mysql-test/t/variables.test:
Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
Reset ha_open_options if one resets the delay_key_write variable.
Before there was no way to reset it without restarting mysqld, which caused some tests to fail
Diffstat (limited to 'include/my_pthread.h')
-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 c479e6f72c6..ea5ca8d10d5 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -671,6 +671,7 @@ extern pthread_mutexattr_t my_errorcheck_mutexattr; typedef ulong my_thread_id; +extern void my_threadattr_global_init(void); extern my_bool my_thread_global_init(void); extern void my_thread_global_end(void); extern my_bool my_thread_init(void); |