diff options
| author | unknown <serg@serg.mylan> | 2006-05-31 18:49:12 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-05-31 18:49:12 +0200 |
| commit | 5abb9f0cc9c8678cdd895d9964e030444c7c4298 (patch) | |
| tree | 9fc61d048fbdc1b179ae930a24dc9f2e2fc1e807 /sql/sql_plugin.cc | |
| parent | 0de72ae91f3101ca4e41d3f9e0a960a3babbb56e (diff) | |
| parent | 8b4581778036c95072438630884ad810b512815a (diff) | |
| download | mariadb-git-5abb9f0cc9c8678cdd895d9964e030444c7c4298.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
include/mysql/plugin.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index d06a682bdce..4f5d952eb7b 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -47,8 +47,8 @@ static int min_plugin_interface_version= 0x0000; static int min_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]= { 0x0000, - 0x0000, - 0x0000 + MYSQL_HANDLERTON_INTERFACE_VERSION, + MYSQL_FTPARSER_INTERFACE_VERSION }; static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]= { @@ -56,6 +56,7 @@ static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]= MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_FTPARSER_INTERFACE_VERSION }; + static DYNAMIC_ARRAY plugin_dl_array; static DYNAMIC_ARRAY plugin_array; static HASH plugin_hash[MYSQL_MAX_PLUGIN_TYPE_NUM]; |