diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /sql/sql_plugin.cc | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 8778713d7e7..a81c05c5513 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -695,7 +695,7 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl, for (i=0; (old= (struct st_maria_plugin *)(ptr + i * sizeof_st_plugin))->info; i++) - memcpy(cur + i, old, min(sizeof(cur[i]), sizeof_st_plugin)); + memcpy(cur + i, old, MY_MIN(sizeof(cur[i]), sizeof_st_plugin)); sym= cur; plugin_dl->allocated= true; |