diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 15:07:15 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 15:07:15 +0300 |
| commit | e8313e13aa765deb8b948731c6c5b23914c11722 (patch) | |
| tree | acbdc8415cbba55527d849790c836f70d5df21dc /sql/ha_partition.cc | |
| parent | 41b2a8a9f344dbd032884f753ad4159850bf05c8 (diff) | |
| parent | b7a4918fe8e1ace2c3ef21a4a4b2ad737d3ccf69 (diff) | |
| download | mariadb-git-e8313e13aa765deb8b948731c6c5b23914c11722.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 7afe148dd17..fdaa1b0cda6 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -7297,7 +7297,8 @@ mysql_declare_plugin(partition) 0x0100, /* 1.0 */ NULL, /* status variables */ NULL, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0, /* flags */ } mysql_declare_plugin_end; |