diff options
author | unknown <brian@zim.(none)> | 2006-09-28 10:51:56 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-09-28 10:51:56 -0700 |
commit | 4de03074d318aa485403b463c51e4b5bf7c6ba29 (patch) | |
tree | 3ac295a506b2714f5b298c281e0b068d9dde1e91 /include | |
parent | 2d48a1f2a3c3539a977839b94a9d3fe703666753 (diff) | |
parent | 62c30cd5d3ec011e7255f0de9c8bcea5ee83fc3d (diff) | |
download | mariadb-git-4de03074d318aa485403b463c51e4b5bf7c6ba29.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql/plugin.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index ae952ccab1e..174c2b85739 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -301,7 +301,6 @@ struct st_mysql_ftparser struct st_mysql_storage_engine { int interface_version; - struct handlerton *handlerton; }; #endif |