summaryrefslogtreecommitdiff
path: root/sql/unireg.h
diff options
context:
space:
mode:
authorSergey Glukhov <gluh@mysql.com>2008-08-25 17:11:59 +0500
committerSergey Glukhov <gluh@mysql.com>2008-08-25 17:11:59 +0500
commitc546559a624a898b98c51cacd6feb6f9eb3dd2be (patch)
tree5a3cae3cfb682a218a0e1754a33d6a63350d46b8 /sql/unireg.h
parentde73b729543f40f46463c0134e380057ee4adb27 (diff)
downloadmariadb-git-c546559a624a898b98c51cacd6feb6f9eb3dd2be.tar.gz
Bug#37428 Potential security issue with UDFs - linux shellcode execution.
plugin_dir option backported from 5.1 mysql-test/r/udf.result: result fix sql/mysql_priv.h: opt_plugin_dir and opt_plugin_dir_ptr declared. sql/mysqld.cc: 'plugin_dir' option added sql/set_var.cc: 'plugin_dir' option added. sql/sql_udf.cc: opt_plugin_dir added to the udf->dl path. Warn if it's not specified. sql/unireg.h: PLUGINDIR defined.
Diffstat (limited to 'sql/unireg.h')
-rw-r--r--sql/unireg.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/unireg.h b/sql/unireg.h
index 1326b22c8c9..8e01e6222e6 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -35,6 +35,9 @@
#ifndef SHAREDIR
#define SHAREDIR "share/"
#endif
+#ifndef PLUGINDIR
+#define PLUGINDIR "lib/plugin"
+#endif
#define ER(X) errmesg[(X) - ER_ERROR_FIRST]
#define ER_SAFE(X) (((X) >= ER_ERROR_FIRST && (X) <= ER_ERROR_LAST) ? ER(X) : "Invalid error code")