summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r--client/mysqltest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 3e61b2ec9b7..bb3effafc84 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -9120,7 +9120,7 @@ static void init_signal_handling(void)
DBUG_ENTER("init_signal_handling");
#ifdef HAVE_STACKTRACE
- my_init_stacktrace();
+ my_init_stacktrace(0);
#endif
sa.sa_flags = SA_RESETHAND | SA_NODEFER;
@@ -10201,7 +10201,7 @@ void append_replace_regex(char* expr, char *expr_end, struct st_replace_regex* r
/* Allow variable for the *entire* list of replacements */
if (*p == '$')
{
- const char *v_end;
+ const char *v_end= 0;
VAR *val= var_get(p, &v_end, 0, 1);
if (val)
@@ -11292,7 +11292,10 @@ static int setenv(const char *name, const char *value, int overwrite)
that always reads from stdin with explicit echo.
*/
-MYSQL_PLUGIN_EXPORT
+extern "C"
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
const char *prompt,
char *buf, int buf_len)