summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorDaniel Fischer <daniel.fischer@oracle.com>2011-09-21 12:40:41 +0200
committerDaniel Fischer <daniel.fischer@oracle.com>2011-09-21 12:40:41 +0200
commitfe1b205d0259e765d83eec3eafd0c41745ff17b4 (patch)
treeb2ce22644a29502769b8202db0ab2e8f3b5ecea6 /storage/myisam
parent0f359571c5ade4acca6b58bb9c0603ed63cb4da1 (diff)
parentd10bddf0ed28b5fac5cfe7d9b3405384ab53f81f (diff)
downloadmariadb-git-fe1b205d0259e765d83eec3eafd0c41745ff17b4.tar.gz
merge from 5.5.16
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/ha_myisam.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 8f7400308ba..b2b64054cf9 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -2086,7 +2086,8 @@ mysql_declare_plugin(myisam)
0x0100, /* 1.0 */
NULL, /* status variables */
myisam_sysvars, /* system variables */
- NULL
+ NULL,
+ 0,
}
mysql_declare_plugin_end;