summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorMats Kindahl <mats.kindahl@oracle.com>2011-08-15 20:12:11 +0200
committerMats Kindahl <mats.kindahl@oracle.com>2011-08-15 20:12:11 +0200
commitcf5e5f837a06d29e6806eea3c47192dc6dd483da (patch)
treea54b38fc92199ba1d0a8467adb980856f5effafe /sql/sql_acl.cc
parentcfb4a7c2ff93a3a653f84d85e5f4b3df16e4f09a (diff)
downloadmariadb-git-cf5e5f837a06d29e6806eea3c47192dc6dd483da.tar.gz
Merging into mysql-5.5.16-release.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 06a67edda36..87beb71cca5 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -9651,7 +9651,8 @@ mysql_declare_plugin(mysql_password)
0x0100, /* Version (1.0) */
NULL, /* status variables */
NULL, /* system variables */
- NULL /* config options */
+ NULL, /* config options */
+ 0, /* flags */
},
{
MYSQL_AUTHENTICATION_PLUGIN, /* type constant */
@@ -9665,7 +9666,8 @@ mysql_declare_plugin(mysql_password)
0x0100, /* Version (1.0) */
NULL, /* status variables */
NULL, /* system variables */
- NULL /* config options */
+ NULL, /* config options */
+ 0, /* flags */
}
mysql_declare_plugin_end;