summaryrefslogtreecommitdiff
path: root/storage/federated
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
commitee789c28b4cf1ac42f975730b567016d3965ea81 (patch)
treea54b38fc92199ba1d0a8467adb980856f5effafe /storage/federated
parentdca971de92e1faa4ea5ff6efc79923de60a6ab86 (diff)
downloadmariadb-git-ee789c28b4cf1ac42f975730b567016d3965ea81.tar.gz
Merging into mysql-5.5.16-release.
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 858895b1add..06bf180283d 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -3481,6 +3481,7 @@ mysql_declare_plugin(federated)
0x0100 /* 1.0 */,
NULL, /* status variables */
NULL, /* system variables */
- NULL /* config options */
+ NULL, /* config options */
+ 0, /* flags */
}
mysql_declare_plugin_end;