summaryrefslogtreecommitdiff
path: root/include/myisam.h
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2015-12-10 03:56:31 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2016-06-14 19:17:29 +0300
commit2b47832a2d261dbaf735b26e796aa126bccafb20 (patch)
tree28cfa4597eb19aeeebf1e718101e37055a2f48da /include/myisam.h
parent6a34ba313005ab861bc9c38b6f9d0624ff17a026 (diff)
downloadmariadb-git-2b47832a2d261dbaf735b26e796aa126bccafb20.tar.gz
Fixed compilation failure using clang
Both aria and myisam storage engines feature a logic path in thr_find_all_keys that leads to undefined behaviour by bypassing the initialization code of variables after my_thread_init(). By refactoring the nested logic into a separate function, this problem is resolved.
Diffstat (limited to 'include/myisam.h')
-rw-r--r--include/myisam.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/myisam.h b/include/myisam.h
index d50b1dc360e..186b049b32e 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -330,7 +330,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;