summaryrefslogtreecommitdiff
path: root/storage/xtradb/btr
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-10-22 14:10:12 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2016-10-22 14:10:12 +0000
commitde5646f1a9aaf45f1b43d98623b40c95fb98ebce (patch)
treebfa47a53f61e3253289a51f348f1e8e3943743db /storage/xtradb/btr
parent8f5e3e2a3491ae0f1b47400a82408b7853ae1efb (diff)
downloadmariadb-git-de5646f1a9aaf45f1b43d98623b40c95fb98ebce.tar.gz
Prepare XtraDB to be used with xtrabackup.
The changes are deliberately kept minimal - some functions are made global instead of static (they will be used in xtrabackup later on) - functions got additional parameter, deliberately unused for now : fil_load_single_tablespaces srv_undo_tablespaces_init - Global variables added, also unused for now : srv_archive_recovery srv_archive_recovery_limit_lsn srv_apply_log_only srv_backup_mode srv_close_files - To make xtrabackup link with sql.lib on Windows, added some missing source files to sql.lib - Fixed os_thread_ret_t to be DWORD on Windows
Diffstat (limited to 'storage/xtradb/btr')
-rw-r--r--storage/xtradb/btr/btr0btr.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/btr/btr0btr.cc b/storage/xtradb/btr/btr0btr.cc
index bce81f95ead..bf6d850f3f0 100644
--- a/storage/xtradb/btr/btr0btr.cc
+++ b/storage/xtradb/btr/btr0btr.cc
@@ -722,7 +722,7 @@ btr_root_fseg_validate(
/**************************************************************//**
Gets the root node of a tree and x- or s-latches it.
@return root page, x- or s-latched */
-static
+
buf_block_t*
btr_root_block_get(
/*===============*/
@@ -1531,7 +1531,7 @@ btr_node_ptr_set_child_page_no(
/************************************************************//**
Returns the child page of a node pointer and x-latches it.
@return child page, x-latched */
-static
+
buf_block_t*
btr_node_ptr_get_child(
/*===================*/