diff options
| author | unknown <brian@zim.(none)> | 2006-09-01 09:19:10 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-01 09:19:10 -0700 |
| commit | b1e2cfce3d9817d8ac4105865df31b41a6526abe (patch) | |
| tree | 56323c4d8d59a1983163b7e1457585082043caad /sql/ha_partition.cc | |
| parent | 16de51bc0783c8f97fe42e293932e93091c7100f (diff) | |
| parent | f1a02cad39b8bc81073cdf6d9ba309803da21b94 (diff) | |
| download | mariadb-git-b1e2cfce3d9817d8ac4105865df31b41a6526abe.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/tmp/mysql-5.1-arch
sql/ha_innodb.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
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; |