summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.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 /storage/myisammrg/ha_myisammrg.cc
parentcfb4a7c2ff93a3a653f84d85e5f4b3df16e4f09a (diff)
downloadmariadb-git-cf5e5f837a06d29e6806eea3c47192dc6dd483da.tar.gz
Merging into mysql-5.5.16-release.
Diffstat (limited to 'storage/myisammrg/ha_myisammrg.cc')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index c76e9ee0bfe..b7e043c99f1 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -1687,6 +1687,7 @@ mysql_declare_plugin(myisammrg)
0x0100, /* 1.0 */
NULL, /* status variables */
NULL, /* system variables */
- NULL /* config options */
+ NULL, /* config options */
+ 0, /* flags */
}
mysql_declare_plugin_end;