summaryrefslogtreecommitdiff
path: root/innobase/fil
diff options
context:
space:
mode:
authormarko@hundin.mysql.fi <>2004-04-06 15:19:12 +0300
committermarko@hundin.mysql.fi <>2004-04-06 15:19:12 +0300
commit4f9b59f71db750cc2d14b0ed3a910b23996a9032 (patch)
treee8bee149eccee86d754e05865d47e893b4dc32b1 /innobase/fil
parentf3302f2e88d561555eb4c446f8e04aa14abfd29d (diff)
parentd9d1957ebe44e5701b68b8233f321fc55c88cc20 (diff)
downloadmariadb-git-4f9b59f71db750cc2d14b0ed3a910b23996a9032.tar.gz
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
Diffstat (limited to 'innobase/fil')
-rw-r--r--innobase/fil/fil0fil.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
index 44f1777bb33..5d45b254afe 100644
--- a/innobase/fil/fil0fil.c
+++ b/innobase/fil/fil0fil.c
@@ -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
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_tablespace_flushes = 0;