diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /sql/sql_plugin.cc | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index d36654c4c18..60137d51a5e 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -513,7 +513,7 @@ static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl, { free_plugin_mem(plugin_dl); report_error(report, ER_OUTOFMEMORY, - static_cast<int>(plugin_dl.dl.length)); + static_cast<int>(plugin_dl->dl.length)); DBUG_RETURN(TRUE); } /* @@ -639,7 +639,7 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl, { free_plugin_mem(plugin_dl); report_error(report, ER_OUTOFMEMORY, - static_cast<int>(plugin_dl.dl.length)); + static_cast<int>(plugin_dl->dl.length)); DBUG_RETURN(TRUE); } /* |