summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-06-16 09:52:12 +0200
committerSergei Golubchik <sergii@pisem.net>2010-06-16 09:52:12 +0200
commitfdd62e53c21f01381e2b366b757d2c3d0e1a207c (patch)
tree5e18c78c14ff5601192b3965f329c8a9433a593a /sql/sql_plugin.cc
parenta670f14ed52ced55b84f94952ddddf8f6c0d7a2b (diff)
downloadmariadb-git-fdd62e53c21f01381e2b366b757d2c3d0e1a207c.tar.gz
bug in converting st_mysql_plugin to st_maria_plugin - all but the last plugin in a dl were lost
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 658688d7159..7512150856c 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -460,32 +460,32 @@ static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl,
i++)
{
- cur->type= old->type;
- cur->info= old->info;
- cur->name= old->name;
- cur->author= old->author;
- cur->descr= old->descr;
- cur->license= old->license;
- cur->init= old->init;
- cur->deinit= old->deinit;
- cur->version= old->version;
- cur->status_vars= old->status_vars;
- cur->system_vars= old->system_vars;
+ cur[i].type= old->type;
+ cur[i].info= old->info;
+ cur[i].name= old->name;
+ cur[i].author= old->author;
+ cur[i].descr= old->descr;
+ cur[i].license= old->license;
+ cur[i].init= old->init;
+ cur[i].deinit= old->deinit;
+ cur[i].version= old->version;
+ cur[i].status_vars= old->status_vars;
+ cur[i].system_vars= old->system_vars;
/*
Something like this should be added to process
new mysql plugin versions:
if (plugin_dl->mysqlversion > 0x0101)
{
- cur->newfield= CONSTANT_MEANS_UNKNOWN;
+ cur[i].newfield= CONSTANT_MEANS_UNKNOWN;
}
else
{
- cur->newfield= old->newfield;
+ cur[i].newfield= old->newfield;
}
*/
/* Maria only fields */
- cur->version_info= "Unknown";
- cur->maturity= MariaDB_PLUGIN_MATURITY_UNKNOWN;
+ cur[i].version_info= "Unknown";
+ cur[i].maturity= MariaDB_PLUGIN_MATURITY_UNKNOWN;
}
plugin_dl->allocated= true;
plugin_dl->plugins= (struct st_maria_plugin *)cur;