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

12956584 followup fix for mysqltest

Browse Source 
run_query_stmt() might use disable_xxx vars after calling handle_no_error
  But handle_no_error() hes reverted any ONCE settings
  Fix is to take revert_properties() out of handle_no_error()
This commit is contained in:
Bjorn Munch 2011-09-30 15:25:19 +02:00
parent da454e2ee1
commit 37de3c2c0b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysqltest.cc
View File

@ -5364,6 +5364,7 @@ do_handle_error:
var_set_errno(0); var_set_errno(0);
handle_no_error(command); handle_no_error(command);
revert_properties();
return 1; /* Connected */ return 1; /* Connected */
} }
@ -7319,6 +7320,7 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
/* If we come here the query is both executed and read successfully */ /* If we come here the query is both executed and read successfully */
handle_no_error(command); handle_no_error(command);
revert_properties();
end: end:
@ -7514,8 +7516,6 @@ void handle_no_error(struct st_command *command)
die("query '%s' succeeded - should have failed with sqlstate %s...", die("query '%s' succeeded - should have failed with sqlstate %s...",
command->query, command->expected_errors.err[0].code.sqlstate); command->query, command->expected_errors.err[0].code.sqlstate);
} }
revert_properties();
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -7546,9 +7546,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
DBUG_ENTER("run_query_stmt"); DBUG_ENTER("run_query_stmt");
DBUG_PRINT("query", ("'%-.60s'", query)); DBUG_PRINT("query", ("'%-.60s'", query));
/* Remember disable_result_log since handle_no_error() may reset it */
my_bool dis_res= disable_result_log;
/* /*
Init a new stmt if it's not already one created for this connection Init a new stmt if it's not already one created for this connection
*/ */
@ -7644,7 +7641,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
/* If we got here the statement was both executed and read successfully */ /* If we got here the statement was both executed and read successfully */
handle_no_error(command); handle_no_error(command);
if (!dis_res) if (!disable_result_log)
{ {
/* /*
Not all statements creates a result set. If there is one we can Not all statements creates a result set. If there is one we can
@ -7720,7 +7717,7 @@ end:
dynstr_free(&ds_prepare_warnings); dynstr_free(&ds_prepare_warnings);
dynstr_free(&ds_execute_warnings); dynstr_free(&ds_execute_warnings);
} }
revert_properties();
/* Close the statement if - no reconnect, need new prepare */ /* Close the statement if - no reconnect, need new prepare */
if (mysql->reconnect) if (mysql->reconnect)