1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for bug#12001

Browse Source
This commit is contained in:
georg@lmy002.wdf.sap.corp 2005-07-19 17:31:18 +02:00
parent 21a88afeed
commit 3e1ae2633a
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql-common/client.c
View File

@ -755,7 +755,7 @@ static void cli_flush_use_result(MYSQL *mysql)
{ {
if (protocol_41(mysql)) if (protocol_41(mysql))
{ {
char *pos= (char*) mysql->net.read_pos; char *pos= (char*) mysql->net.read_pos + 1;
mysql->warning_count=uint2korr(pos); pos+=2; mysql->warning_count=uint2korr(pos); pos+=2;
mysql->server_status=uint2korr(pos); pos+=2; mysql->server_status=uint2korr(pos); pos+=2;
} }

44
tests/mysql_client_test.c
View File

@ -11751,6 +11751,49 @@ static void test_bug11183()
myquery(rc); myquery(rc);
} }
static void test_bug12001()
{
MYSQL *mysql_local;
MYSQL_RES *result;
const char *query = "DROP TABLE IF EXISTS test_table;"
"CREATE TABLE test_table(id INT);"
"INSERT INTO test_table VALUES(10);"
"UPDATE test_table SET id=20 WHERE id=10;"
"SELECT * FROM test_table;"
"INSERT INTO non_existent_table VALUES(11);";
int rc, res;
myheader("test_bug12001");
if (!(mysql_local= mysql_init(NULL)))
{
fprintf(stdout, "\n mysql_init() failed");
exit(1);
}
/* Create connection that supports multi statements */
if (!mysql_real_connect(mysql_local, opt_host, opt_user,
opt_password, current_db, opt_port,
opt_unix_socket, CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS)) {
fprintf(stdout, "\n mysql_real_connect() failed");
exit(1);
}
rc = mysql_query(mysql_local, query);
myquery(rc);
do {
if (mysql_field_count(mysql_local) && (result = mysql_use_result(mysql_local))) {
mysql_free_result(result);
}
} while (!(res = mysql_next_result(mysql_local)));
rc = mysql_query(mysql_local, "DROP TABLE IF EXISTS test_table");
myquery(rc);
mysql_close(mysql_local);
DIE_UNLESS(res==1);
}
/* /*
Read and parse arguments and MySQL options from my.cnf Read and parse arguments and MySQL options from my.cnf
@ -11968,6 +12011,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug8378", test_bug8378 }, { "test_bug8378", test_bug8378 },
{ "test_bug9735", test_bug9735 }, { "test_bug9735", test_bug9735 },
{ "test_bug11183", test_bug11183 }, { "test_bug11183", test_bug11183 },
{ "test_bug12001", test_bug12001 },
{ 0, 0 } { 0, 0 }
}; };