summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-11-07 19:07:47 +0100
committerSergei Golubchik <sergii@pisem.net>2012-11-07 19:07:47 +0100
commit06365bf841eab74a1cb4b17e836ff0c372a0dd79 (patch)
tree55c33aebd83f7c8662b9ebb7dd35882a3ff7b3a5
parenta52270d7acdbe6f373f089393a96573b874eb381 (diff)
downloadmariadb-git-06365bf841eab74a1cb4b17e836ff0c372a0dd79.tar.gz
rename plugin null_audit -> audit_null (to match status variable names)
create audit_null.test
-rw-r--r--mysql-test/suite/plugins/r/audit_null.result18
-rw-r--r--mysql-test/suite/plugins/t/audit_null.test18
-rw-r--r--plugin/audit_null/audit_null.c2
3 files changed, 37 insertions, 1 deletions
diff --git a/mysql-test/suite/plugins/r/audit_null.result b/mysql-test/suite/plugins/r/audit_null.result
new file mode 100644
index 00000000000..6cb6356ce98
--- /dev/null
+++ b/mysql-test/suite/plugins/r/audit_null.result
@@ -0,0 +1,18 @@
+set @old_global_general_log=@@global.general_log;
+set global general_log=OFF;
+install plugin audit_null soname 'adt_null';
+select 1;
+1
+1
+select foobar;
+ERROR 42S22: Unknown column 'foobar' in 'field list'
+show status like 'audit_null%';
+Variable_name Value
+Audit_null_called 6
+Audit_null_general_error 1
+Audit_null_general_log 0
+Audit_null_general_result 2
+uninstall plugin audit_null;
+Warnings:
+Warning 1620 Plugin is busy and will be uninstalled on shutdown
+set global general_log=@old_global_general_log;
diff --git a/mysql-test/suite/plugins/t/audit_null.test b/mysql-test/suite/plugins/t/audit_null.test
new file mode 100644
index 00000000000..52bbc0d08e4
--- /dev/null
+++ b/mysql-test/suite/plugins/t/audit_null.test
@@ -0,0 +1,18 @@
+if (!$ADT_NULL_SO) {
+ skip No NULL_AUDIT plugin;
+}
+
+set @old_global_general_log=@@global.general_log;
+set global general_log=OFF;
+
+install plugin audit_null soname 'adt_null';
+
+select 1;
+--error 1054
+select foobar;
+show status like 'audit_null%';
+
+uninstall plugin audit_null;
+
+set global general_log=@old_global_general_log;
+
diff --git a/plugin/audit_null/audit_null.c b/plugin/audit_null/audit_null.c
index 469e5ae494c..be0c70fbd35 100644
--- a/plugin/audit_null/audit_null.c
+++ b/plugin/audit_null/audit_null.c
@@ -145,7 +145,7 @@ mysql_declare_plugin(audit_null)
{
MYSQL_AUDIT_PLUGIN, /* type */
&audit_null_descriptor, /* descriptor */
- "NULL_AUDIT", /* name */
+ "AUDIT_NULL", /* name */
"Oracle Corp", /* author */
"Simple NULL Audit", /* description */
PLUGIN_LICENSE_GPL,