diff options
| author | unknown <brian@zim.(none)> | 2006-09-06 09:23:47 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-06 09:23:47 -0700 |
| commit | b03d4e9e634fa16b79d265be2c3a12e1baec3098 (patch) | |
| tree | 8fadc1c847f161a060706946e7efd69bc5654fec /sql/ha_partition.cc | |
| parent | 04c78289dea881c78457ffc1aaae239d8fdf5463 (diff) | |
| parent | a2da2af132fb87af3552516d01dcd614491bcf03 (diff) | |
| download | mariadb-git-b03d4e9e634fa16b79d265be2c3a12e1baec3098.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/tmp/merge-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 30c64760c88..bd8d604ef0d 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5640,7 +5640,9 @@ mysql_declare_plugin(partition) partition_initialize, /* Plugin Init */ NULL, /* Plugin Deinit */ 0x0100, /* 1.0 */ - 0 + NULL, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; |