cleanup: Aria headers

include/maria.h is a common header included in half of the server,
if should only contain definitions and declarations that are
used outside of storage/maria

internal definitions and declarations should be in maria_def.h

also remove few duplicate declarations

storage/maria/ha_maria.h

@@ -21,7 +21,7 @@
 
 /* class for the maria handler */
 
-#include <maria.h>
+#include "maria_def.h"
 #include "handler.h"
 #include "table.h"
 

storage/maria/ma_pagecache.h

@@ -354,8 +354,6 @@ extern my_bool multi_pagecache_set(const uchar *key, uint length,
 				   PAGECACHE *pagecache);
 extern void multi_pagecache_change(PAGECACHE *old_data,
 				   PAGECACHE *new_data);
-extern int reset_pagecache_counters(const char *name,
-                                    PAGECACHE *pagecache);
 #ifndef DBUG_OFF
 void pagecache_file_no_dirty_page(PAGECACHE *pagecache, PAGECACHE_FILE *file);
 #else

storage/maria/ma_sp_test.c

@@ -17,7 +17,7 @@
 /* Written by Alex Barkov, who has a shared copyright to this code */
 
 #include <my_global.h>
-#include "maria.h"
+#include "maria_def.h"
 
 #ifdef HAVE_SPATIAL
 #include "ma_sp_defs.h"

storage/maria/ma_state.h

@@ -13,6 +13,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
+#ifndef MA_STATE_INCLUDED
+#define MA_STATE_INCLUDED
+C_MODE_START
+
 /* Struct to store tables in use by one transaction */
 
 typedef struct st_maria_status_info
@@ -69,10 +73,6 @@ void _ma_copy_status(void* to, void *from);
 my_bool _ma_reset_update_flag(void *param, my_bool concurrent_insert);
 my_bool _ma_start_trans(void* param);
 my_bool _ma_check_status(void *param);
-my_bool _ma_block_get_status(void* param, my_bool concurrent_insert);
-void _ma_block_update_status(void *param);
-void _ma_block_restore_status(void *param);
-my_bool _ma_block_check_status(void *param);
 void maria_versioning(MARIA_HA *info, my_bool versioning);
 void _ma_set_share_data_file_length(struct st_maria_share *share,
                                     ulonglong new_length);
@@ -86,3 +86,6 @@ void _ma_remove_not_visible_states_with_lock(struct st_maria_share *share,
                                              my_bool all);
 void _ma_remove_table_from_trnman(MARIA_HA *info);
 void _ma_reset_history(struct st_maria_share *share);
+
+C_MODE_END
+#endif