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 branch '5.5' into bb-10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2016-06-21 14:11:02 +02:00
parent 1d21b22155 a482e76e65
commit c081c978a2
84 changed files with 1451 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/myisam.h
View File

@@ -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;