summaryrefslogtreecommitdiff
path: root/sql/unireg.h
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-07-31 15:28:15 -0400
committerIgnacio Galarza <iggy@mysql.com>2009-07-31 15:28:15 -0400
commit008dd95f70a53335f7979e553f7178dfce2565ab (patch)
tree3225891d5cfadb66f761de37a6ec8f85ca6ac751 /sql/unireg.h
parent4e95179af9c2f2589093ea9f94472d8d047892c7 (diff)
parent09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff)
downloadmariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz
Auto-merge
Diffstat (limited to 'sql/unireg.h')
-rw-r--r--sql/unireg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.h b/sql/unireg.h
index 6f9c44d98f9..3ff7f058e3c 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -29,8 +29,8 @@
#define TEMP_PREFIX "MY"
#define LOG_PREFIX "ML"
#define PROGDIR "bin/"
-#ifndef DATADIR
-#define DATADIR "data/"
+#ifndef MYSQL_DATADIR
+#define MYSQL_DATADIR "data/"
#endif
#ifndef SHAREDIR
#define SHAREDIR "share/"