diff options
author | Michael Widenius <monty@askmonty.org> | 2013-03-01 18:09:06 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-03-01 18:09:06 +0200 |
commit | 4cace76d4d3d75cf94762497937479c475d12167 (patch) | |
tree | 9c7bad491bb0762dfb460bdd9dc9c58b840a3e49 /storage | |
parent | 492c3b09d2b3c11ebb043276ff4b245d54d99fd0 (diff) | |
parent | 8ed283d882e7147b1caa3f90f708720c94446024 (diff) | |
download | mariadb-git-4cace76d4d3d75cf94762497937479c475d12167.tar.gz |
Automatic merge
Diffstat (limited to 'storage')
-rw-r--r-- | storage/maria/ha_maria.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 545daca12fe..80762296395 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -35,7 +35,6 @@ C_MODE_START ICP_RESULT index_cond_func_maria(void *arg); C_MODE_END -extern ulong maria_sort_buffer_size; extern TYPELIB maria_recover_typelib; extern ulonglong maria_recover_options; |