diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-05-18 16:45:59 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-05-18 16:45:59 +0300 |
| commit | 3f4ef5928e72faf2b7fd0c98c8705ac649d2faf9 (patch) | |
| tree | c1dd9f5adbd4909ec398600775488c6951620396 /sql | |
| parent | 32498ead2d79d8db2371aed8d648476041cb4e0e (diff) | |
| parent | 960f6600c86d8b94e29825a3a6bf72f92353e17f (diff) | |
| download | mariadb-git-3f4ef5928e72faf2b7fd0c98c8705ac649d2faf9.tar.gz | |
Automatic merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.h | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/handler.h b/sql/handler.h index f118f1d3c5b..142139dbabc 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1063,7 +1063,7 @@ inline LEX_STRING *hton_name(const handlerton *hton) #define HTON_NO_FLAGS 0 #define HTON_CLOSE_CURSORS_AT_COMMIT (1 << 0) #define HTON_ALTER_NOT_SUPPORTED (1 << 1) //Engine does not support alter -#define HTON_CAN_RECREATE (1 << 2) //Delete all is used fro truncate +#define HTON_CAN_RECREATE (1 << 2) //Delete all is used for truncate #define HTON_HIDDEN (1 << 3) //Engine does not appear in lists #define HTON_NOT_USER_SELECTABLE (1 << 5) #define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index a7d7f464fca..ff43c7abd55 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -739,15 +739,14 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report) } bzero(&plugin_dl, sizeof(plugin_dl)); /* Compile dll path */ - dlpathlen= - strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", dl->str, NullS) - - dlpath; + strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", dl->str, NullS); (void) unpack_filename(dlpath, dlpath); plugin_dl.ref_count= 1; /* Open new dll handle */ if (!(plugin_dl.handle= dlopen(dlpath, RTLD_NOW))) { const char *errmsg=dlerror(); + dlpathlen= strlen(dlpath); if (!strncmp(dlpath, errmsg, dlpathlen)) { // if errmsg starts from dlpath, trim this prefix. errmsg+=dlpathlen; |