database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-27 13:04:36 +03:00
Code Activity

InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.x

Browse Source
This commit is contained in:
marko@hundin.mysql.fi
2004-04-05 15:40:56 +03:00
parent 23a5fc5558
commit f7f8efc263
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
innobase/fil/fil0fil.c
View File

@@ -77,6 +77,11 @@ out of the LRU-list and keep a count of pending operations. When an operation
completes, we decrement the count and return the file node to the LRU-list if completes, we decrement the count and return the file node to the LRU-list if
the count drops to zero. */ the count drops to zero. */
/* When mysqld is run, the default directory "." is the mysqld datadir,
but in the MySQL Embedded Server Library and ibbackup it is not the default
directory, and we must set the base file path explicitly */
const char* fil_path_to_mysql_datadir = ".";
ulint fil_n_pending_log_flushes = 0; ulint fil_n_pending_log_flushes = 0;
ulint fil_n_pending_tablespace_flushes = 0; ulint fil_n_pending_tablespace_flushes = 0;

5
innobase/include/fil0fil.h
View File

@@ -16,6 +16,11 @@ Created 10/25/1995 Heikki Tuuri
#include "ut0byte.h" #include "ut0byte.h"
#include "os0file.h" #include "os0file.h"
/* When mysqld is run, the default directory "." is the mysqld datadir, but in
ibbackup we must set it explicitly; the path must NOT contain the trailing
'/' or '\' */
extern const char* fil_path_to_mysql_datadir;
/* 'null' (undefined) page offset in the context of file spaces */ /* 'null' (undefined) page offset in the context of file spaces */
#define FIL_NULL ULINT32_UNDEFINED #define FIL_NULL ULINT32_UNDEFINED

1
sql/ha_innodb.cc
View File

@@ -714,6 +714,7 @@ innobase_init(void)
if (mysql_embedded) { if (mysql_embedded) {
default_path = mysql_real_data_home; default_path = mysql_real_data_home;
fil_path_to_mysql_datadir = mysql_real_data_home;
} else { } else {
/* It's better to use current lib, to keep paths short */ /* It's better to use current lib, to keep paths short */
current_dir[0] = FN_CURLIB; current_dir[0] = FN_CURLIB;