diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | include/maria.h | 70 | ||||
| -rw-r--r-- | include/mysql/innodb_priv.h | 36 | ||||
| -rw-r--r-- | include/thread_pool_priv.h (renamed from include/mysql/thread_pool_priv.h) | 0 |
4 files changed, 17 insertions, 112 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 3046c3f7614..6404074c8c9 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -14,11 +14,11 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SET(HEADERS_GEN_CONFIGURE -${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h -${CMAKE_CURRENT_BINARY_DIR}/my_config.h -${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h -${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h -${CMAKE_CURRENT_BINARY_DIR}/sql_state.h + mysql_version.h + my_config.h + mysqld_ername.h + mysqld_error.h + sql_state.h ) SET(HEADERS @@ -49,8 +49,19 @@ SET(HEADERS m_ctype.h my_attribute.h my_compiler.h - ${HEADERS_GEN_CONFIGURE} ) INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) +FOREACH(f ${HEADERS_GEN_CONFIGURE}) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) +ENDFOREACH(f) INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") + +STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") +STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + +INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) diff --git a/include/maria.h b/include/maria.h index 404ce98dafd..cb2f92e8a35 100644 --- a/include/maria.h +++ b/include/maria.h @@ -24,7 +24,6 @@ extern "C" { #include <my_base.h> #include <my_sys.h> #include <m_ctype.h> -#include "../storage/maria/ma_pagecache.h" #include "my_compare.h" #include "ft_global.h" #include <myisamchk.h> @@ -268,7 +267,6 @@ extern my_bool maria_flush, maria_single_user, maria_page_checksums; extern my_bool maria_delay_key_write; extern my_off_t maria_max_temp_length; extern ulong maria_bulk_insert_tree_size, maria_data_pointer_size; -extern PAGECACHE maria_pagecache_var, *maria_pagecache; extern MY_TMPDIR *maria_tmpdir; /* This is used to check if a symlink points into the mysql data home, @@ -353,69 +351,6 @@ typedef struct st_maria_bit_buff uint error; } MARIA_BIT_BUFF; - -typedef struct st_maria_sort_info -{ - /* sync things */ - mysql_mutex_t mutex; - mysql_cond_t cond; - MARIA_HA *info, *new_info; - HA_CHECK *param; - char *buff; - SORT_KEY_BLOCKS *key_block, *key_block_end; - SORT_FT_BUF *ft_buf; - my_off_t filelength, dupp, buff_length; - pgcache_page_no_t page; - ha_rows max_records; - uint current_key, total_keys; - uint got_error, threads_running; - myf myf_rw; - enum data_file_type new_data_file_type, org_data_file_type; -} MARIA_SORT_INFO; - -typedef struct st_maria_sort_param -{ - pthread_t thr; - IO_CACHE read_cache, tempfile, tempfile_for_exceptions; - DYNAMIC_ARRAY buffpek; - MARIA_BIT_BUFF bit_buff; /* For parallel repair of packrec. */ - - MARIA_KEYDEF *keyinfo; - MARIA_SORT_INFO *sort_info; - HA_KEYSEG *seg; - uchar **sort_keys; - uchar *rec_buff; - void *wordlist, *wordptr; - MEM_ROOT wordroot; - uchar *record; - MY_TMPDIR *tmpdir; - - /* - The next two are used to collect statistics, see maria_update_key_parts for - description. - */ - ulonglong unique[HA_MAX_KEY_SEG+1]; - ulonglong notnull[HA_MAX_KEY_SEG+1]; - - MARIA_RECORD_POS pos,max_pos,filepos,start_recpos, current_filepos; - uint key, key_length,real_key_length,sortbuff_size; - uint maxbuffers, keys, find_length, sort_keys_length; - my_bool fix_datafile, master; - my_bool calc_checksum; /* calculate table checksum */ - size_t rec_buff_size; - - int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *); - int (*key_read)(struct st_maria_sort_param *, uchar *); - int (*key_write)(struct st_maria_sort_param *, const uchar *); - void (*lock_in_memory)(HA_CHECK *); - int (*write_keys)(struct st_maria_sort_param *, register uchar **, - uint , struct st_buffpek *, IO_CACHE *); - uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint); - int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,uchar *, - uint, uint); -} MARIA_SORT_PARAM; - - /* functions in maria_check */ void maria_chk_init(HA_CHECK *param); void maria_chk_init_for_check(HA_CHECK *param, MARIA_HA *info); @@ -443,7 +378,6 @@ int maria_filecopy(HA_CHECK *param, File to, File from, my_off_t start, my_off_t length, const char *type); int maria_movepoint(MARIA_HA *info, uchar *record, my_off_t oldpos, my_off_t newpos, uint prot_key); -int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile); int maria_test_if_almost_full(MARIA_HA *info); int maria_recreate_table(HA_CHECK *param, MARIA_HA **org_info, char *filename); int maria_disable_indexes(MARIA_HA *info); @@ -456,10 +390,6 @@ my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map, int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows); void maria_flush_bulk_insert(MARIA_HA *info, uint inx); void maria_end_bulk_insert(MARIA_HA *info); -int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map, - PAGECACHE *key_cache); -void maria_change_pagecache(PAGECACHE *old_key_cache, - PAGECACHE *new_key_cache); int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves); void maria_versioning(MARIA_HA *info, my_bool versioning); void maria_ignore_trids(MARIA_HA *info); diff --git a/include/mysql/innodb_priv.h b/include/mysql/innodb_priv.h deleted file mode 100644 index 5406c292b18..00000000000 --- a/include/mysql/innodb_priv.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifndef INNODB_PRIV_INCLUDED -#define INNODB_PRIV_INCLUDED - -/** @file Declaring server-internal functions that are used by InnoDB. */ - -#include <sql_priv.h> - -class THD; - -int get_quote_char_for_identifier(THD *thd, const char *name, uint length); -bool schema_table_store_record(THD *thd, TABLE *table); -void localtime_to_TIME(MYSQL_TIME *to, struct tm *from); -bool check_global_access(THD *thd, ulong want_access); -uint strconvert(CHARSET_INFO *from_cs, const char *from, - CHARSET_INFO *to_cs, char *to, uint to_length, - uint *errors); -void sql_print_error(const char *format, ...); - - - -#endif /* INNODB_PRIV_INCLUDED */ diff --git a/include/mysql/thread_pool_priv.h b/include/thread_pool_priv.h index 4060cf51733..4060cf51733 100644 --- a/include/mysql/thread_pool_priv.h +++ b/include/thread_pool_priv.h |