1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merging from 5.1

This commit is contained in:
Alexander Barkov
2011-02-18 17:19:55 +03:00

View File

@ -19307,7 +19307,7 @@ static void test_bug58036()
if (!opt_silent)
printf("mysql_real_connect() succeeded (failure expected)\n");
mysql_close(conn);
DIE();
DIE("");
}
if (!opt_silent)
@ -19333,7 +19333,7 @@ static void test_bug58036()
printf("mysql_real_connect() failed: %s (%d)\n",
mysql_error(conn), mysql_errno(conn));
mysql_close(conn);
DIE();
DIE("");
}
mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2");
@ -19342,7 +19342,7 @@ static void test_bug58036()
if (!opt_silent)
printf("mysql_change_user() succedded, error expected!");
mysql_close(conn);
DIE();
DIE("");
}
if (!opt_silent)