summaryrefslogtreecommitdiff
path: root/sql-common/client_plugin.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
commitcd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch)
tree95bf82d0e0522c6af708cd28639c82e004b5a264 /sql-common/client_plugin.c
parentf884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff)
parentd516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff)
downloadmariadb-git-10.2-connector-c-integ.tar.gz
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'sql-common/client_plugin.c')
-rw-r--r--sql-common/client_plugin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index 063fc5c6dc6..dd87b01d932 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -235,7 +235,7 @@ static void load_env_plugins(MYSQL *mysql)
This function must be called before any other client plugin function.
@retval 0 successful
- @retval != 0 error occured
+ @retval != 0 error occurred
*/
int mysql_client_plugin_init()
{