diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-24 12:01:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-24 12:01:22 -0400 |
| commit | 14d62505d90f01eb6d81466c1d69fa38523c4d3e (patch) | |
| tree | 98e08ad71dd605fdfbad22080be969ecae6747ce /include | |
| parent | 868c2ceb013e06c29ba37d4634f2d543b96539aa (diff) | |
| parent | 9fc102b37ec45bf5a1010a9f660137304de482bc (diff) | |
| download | mariadb-git-14d62505d90f01eb6d81466c1d69fa38523c4d3e.tar.gz | |
Merge tag 'mariadb-10.0.26' into 10.0-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | include/my_tree.h | 2 | ||||
| -rw-r--r-- | include/myisam.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index d7853a46ecb..d0c4768e882 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -76,3 +76,9 @@ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Developm PATTERN CMakeFiles EXCLUDE PATTERN mysql EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) + +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) diff --git a/include/my_tree.h b/include/my_tree.h index f8be55f84b2..02cab02b52e 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/myisam.h b/include/myisam.h index 88ce401fabc..f7a3ae8cc8a 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -331,7 +331,8 @@ typedef struct st_sort_info my_off_t filelength, dupp, buff_length; ha_rows max_records; uint current_key, total_keys; - uint got_error, threads_running; + volatile uint got_error; + uint threads_running; myf myf_rw; enum data_file_type new_data_file_type; } MI_SORT_INFO; |