Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
acc83798
Commit
acc83798
authored
Jan 17, 2016
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fixed compilation failure on MacOSX"
This reverts commit
df32495c
.
parent
275f7d7d
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
313 additions
and
350 deletions
+313
-350
include/myisam.h
include/myisam.h
+1
-2
storage/maria/ma_sort.c
storage/maria/ma_sort.c
+157
-176
storage/maria/maria_def.h
storage/maria/maria_def.h
+1
-2
storage/myisam/sort.c
storage/myisam/sort.c
+154
-170
No files found.
include/myisam.h
View file @
acc83798
...
@@ -331,8 +331,7 @@ typedef struct st_sort_info
...
@@ -331,8 +331,7 @@ typedef struct st_sort_info
my_off_t
filelength
,
dupp
,
buff_length
;
my_off_t
filelength
,
dupp
,
buff_length
;
ha_rows
max_records
;
ha_rows
max_records
;
uint
current_key
,
total_keys
;
uint
current_key
,
total_keys
;
volatile
uint
got_error
;
uint
got_error
,
threads_running
;
uint
threads_running
;
myf
myf_rw
;
myf
myf_rw
;
enum
data_file_type
new_data_file_type
;
enum
data_file_type
new_data_file_type
;
}
MI_SORT_INFO
;
}
MI_SORT_INFO
;
...
...
storage/maria/ma_sort.c
View file @
acc83798
This diff is collapsed.
Click to expand it.
storage/maria/maria_def.h
View file @
acc83798
...
@@ -67,8 +67,7 @@ typedef struct st_maria_sort_info
...
@@ -67,8 +67,7 @@ typedef struct st_maria_sort_info
pgcache_page_no_t
page
;
pgcache_page_no_t
page
;
ha_rows
max_records
;
ha_rows
max_records
;
uint
current_key
,
total_keys
;
uint
current_key
,
total_keys
;
volatile
uint
got_error
;
uint
got_error
,
threads_running
;
uint
threads_running
;
myf
myf_rw
;
myf
myf_rw
;
enum
data_file_type
new_data_file_type
,
org_data_file_type
;
enum
data_file_type
new_data_file_type
,
org_data_file_type
;
}
MARIA_SORT_INFO
;
}
MARIA_SORT_INFO
;
...
...
storage/myisam/sort.c
View file @
acc83798
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment