Commit b7d30e27 authored by Alexander Barkov's avatar Alexander Barkov

Merging from 5.1

parents 7a7c9582 e2e6eb8f
...@@ -19307,7 +19307,7 @@ static void test_bug58036() ...@@ -19307,7 +19307,7 @@ static void test_bug58036()
if (!opt_silent) if (!opt_silent)
printf("mysql_real_connect() succeeded (failure expected)\n"); printf("mysql_real_connect() succeeded (failure expected)\n");
mysql_close(conn); mysql_close(conn);
DIE(); DIE("");
} }
if (!opt_silent) if (!opt_silent)
...@@ -19333,7 +19333,7 @@ static void test_bug58036() ...@@ -19333,7 +19333,7 @@ static void test_bug58036()
printf("mysql_real_connect() failed: %s (%d)\n", printf("mysql_real_connect() failed: %s (%d)\n",
mysql_error(conn), mysql_errno(conn)); mysql_error(conn), mysql_errno(conn));
mysql_close(conn); mysql_close(conn);
DIE(); DIE("");
} }
mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2"); mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2");
...@@ -19342,7 +19342,7 @@ static void test_bug58036() ...@@ -19342,7 +19342,7 @@ static void test_bug58036()
if (!opt_silent) if (!opt_silent)
printf("mysql_change_user() succedded, error expected!"); printf("mysql_change_user() succedded, error expected!");
mysql_close(conn); mysql_close(conn);
DIE(); DIE("");
} }
if (!opt_silent) if (!opt_silent)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment