diff options
| author | unknown <brian@zim.(none)> | 2006-09-26 22:51:53 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-26 22:51:53 -0700 |
| commit | 62c30cd5d3ec011e7255f0de9c8bcea5ee83fc3d (patch) | |
| tree | 4b1520ab1c777a318c2b3410afe8334660027768 /sql | |
| parent | 80fc43c1fecd63a4927004ff06a1c4d26a389cf5 (diff) | |
| parent | 057f98b326c137d85bef3a851b14282a4aef2cfe (diff) | |
| download | mariadb-git-62c30cd5d3ec011e7255f0de9c8bcea5ee83fc3d.tar.gz | |
Merge zim.(none):/home/brian/mysql/merge-5.1
into zim.(none):/home/brian/mysql/arch-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 2 | ||||
| -rw-r--r-- | sql/log.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 0739b704462..157af825063 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -10749,7 +10749,7 @@ SHOW_VAR ndb_status_variables_export[]= { }; struct st_mysql_storage_engine ndbcluster_storage_engine= -{ MYSQL_HANDLERTON_INTERFACE_VERSION, ndbcluster_hton }; +{ MYSQL_HANDLERTON_INTERFACE_VERSION }; mysql_declare_plugin(ndbcluster) { diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index e435b356def..8e704f34550 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5632,7 +5632,7 @@ static int free_share(PARTITION_SHARE *share) #endif /* NOT_USED */ struct st_mysql_storage_engine partition_storage_engine= -{ MYSQL_HANDLERTON_INTERFACE_VERSION, partition_hton }; +{ MYSQL_HANDLERTON_INTERFACE_VERSION }; mysql_declare_plugin(partition) { diff --git a/sql/log.cc b/sql/log.cc index 9875b16f8e5..9c2efb04a44 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4678,7 +4678,7 @@ err1: } struct st_mysql_storage_engine binlog_storage_engine= -{ MYSQL_HANDLERTON_INTERFACE_VERSION, binlog_hton }; +{ MYSQL_HANDLERTON_INTERFACE_VERSION }; mysql_declare_plugin(binlog) { |