summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2010-09-27 16:55:09 +0400
committerSergey Vojtovich <svoj@sun.com>2010-09-27 16:55:09 +0400
commit37afe1b34a20ffebe98381629ec615bd5957518a (patch)
tree9d2655f48144b0c9a7fe030e8c58bc01496c0a78 /sql/share
parentf4444c0016c68feb3f300c4b30b886cd407f5824 (diff)
downloadmariadb-git-37afe1b34a20ffebe98381629ec615bd5957518a.tar.gz
WL#5341 - Sticky plugins
This patch implements "permanent" load option for plugins as specified by WL#5341. mysql-test/r/plugin_load_option.result: A test case for WL#5341. mysql-test/t/plugin_load_option-master.opt: A test case for WL#5341. mysql-test/t/plugin_load_option.test: A test case for WL#5341. sql/share/errmsg-utf8.txt: An error message for WL#5341. sql/sql_plugin.cc: Added FORCE_PLUS_PERMANENT plugin load option. sql/sql_plugin.h: Expose and use plugin load option instead of is_mandatory flag. This is a requirement for to-be-implemented WL5496.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 9e7fdbfeae5..b01b824f236 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6346,3 +6346,5 @@ ER_STORED_FUNCTION_PREVENTS_SWITCH_SQL_LOG_BIN
ER_FAILED_READ_FROM_PAR_FILE
eng "Failed to read from the .par file"
swe "Misslyckades läsa från .par filen"
+ER_PLUGIN_IS_PERMANENT
+ eng "Plugin '%s' is force_plus_permanent and can not be unloaded"