diff options
| author | Kenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com> | 2020-05-03 09:14:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 09:14:56 +0200 |
| commit | cd593de68b02d77766fcb3b7b2a869096ceb7183 (patch) | |
| tree | 2245738ce70d50031b927fed560815458658c7c2 /src/common/sql.c | |
| parent | f70a887b188dbd88c45c9992cd18a33b6886005f (diff) | |
| parent | f40cc839413cc82aed445d39cc3aa204dce87780 (diff) | |
| download | hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.gz hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.bz2 hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.xz hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.zip | |
Merge branch 'master' into cell_noskill
Diffstat (limited to 'src/common/sql.c')
| -rw-r--r-- | src/common/sql.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/sql.c b/src/common/sql.c index 0b5b7fa07..bd00619eb 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -94,6 +94,9 @@ static struct Sql *Sql_Malloc(void) { my_bool reconnect = 1; mysql_options(&self->handle, MYSQL_OPT_RECONNECT, &reconnect); +#ifdef WIN32 + mysql_optionsv(&self->handle, MYSQL_PLUGIN_DIR, MARIADB_PLUGINDIR); +#endif } return self; } |