Skip to content

M
MariaDB
Commit 83016f14 authored by unknown's avatar unknown
Browse files
Options

Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 

 - Added functionality to check errors returned from mysql_next_result
 - Exit from mysqltest when and unexpected error occurs.
 - The above fixes reveal problems with rpl000009, sp-error and query_cache-
 - Fix sp-error by adding an expected error
 - Fix rpl000009 by not sending "ok" from mysql_create_db when called with silent flag from load_master_data
 - Fix query_cache in separate patch


client/mysqltest.c:
  Check and handle error after mysql_next_result
  Change several verbose_msg to die so that the error is properly reported
  Clean up of error handling code in run_query_stmt, check all errors and use common
  function handle_error.
mysql-test/r/mysqltest.result:
  mysqltest now dies when a query fails with wrong errno
mysql-test/r/sp-error.result:
  Update test result to match the expected error from calling the sp closing a cursor that is not open.
mysql-test/t/sp-error.test:
  Add missing --error 1326 before call to sp that closes a already closed cursor.
  Add test for bug9367
sql/sql_db.cc:
  Don't send ok in mysql_create_db if silent flag is set.
parent 268b309d
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 92 deletions
client/mysqltest.c
View file @ 83016f14
......@@ -3056,12 +3056,6 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
goto end;
}
if (handle_no_error(q))
{
error= 1;
goto end;
}
if (!disable_result_log)
{
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
......@@ -3106,12 +3100,9 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
MYSQL_RES *warn_res=0;
uint count= mysql_warning_count(mysql);
if (!mysql_real_query(mysql, "SHOW WARNINGS", 13))
{
warn_res= mysql_store_result(mysql);
}
if (!warn_res)
verbose_msg("Warning count is %u but didn't get any warnings",
count);
die("Warning count is %u but didn't get any warnings", count);
else
{
dynstr_append_mem(ds, "Warnings:\n", 10);
......@@ -3142,15 +3133,28 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
}
else if (q->record_file[0])
{
error = check_result(ds, q->record_file, q->require_file);
error= check_result(ds, q->record_file, q->require_file);
}
if (res)
mysql_free_result(res);
last_result= 0;
counter++;
} while (!(err= mysql_next_result(mysql)));
if (err >= 1)
mysql_error(mysql);
if (err > 0)
{
/* We got an error from mysql_next_result, maybe expected */
if (handle_error(query, q, mysql_errno(mysql), mysql_error(mysql),
mysql_sqlstate(mysql), ds))
error= 1;
goto end;
}
// If we come here the query is both executed and read successfully
if (handle_no_error(q))
{
error= 1;
goto end;
}
end:
free_replace();
......@@ -3203,8 +3207,7 @@ static int handle_error(const char *query, struct st_query *q,
abort_not_supported_test();
if (q->abort_on_error)
die("query '%s' failed: %d: %s", query,
err_errno, err_error);
die("query '%s' failed: %d: %s", query, err_errno, err_error);
for (i= 0 ; (uint) i < q->expected_errors ; i++)
{
......@@ -3243,13 +3246,11 @@ static int handle_error(const char *query, struct st_query *q,
if (i)
{
if (q->expected_errno[0].type == ERR_ERRNO)
verbose_msg("query '%s' failed with wrong errno %d instead of %d...",
q->query, err_errno,
q->expected_errno[0].code.errnum);
die("query '%s' failed with wrong errno %d instead of %d...",
q->query, err_errno, q->expected_errno[0].code.errnum);
else
verbose_msg("query '%s' failed with wrong sqlstate %s instead of %s...",
q->query, err_sqlstate,
q->expected_errno[0].code.sqlstate);
die("query '%s' failed with wrong sqlstate %s instead of %s...",
q->query, err_sqlstate, q->expected_errno[0].code.sqlstate);
DBUG_RETURN(1);
}
......@@ -3283,16 +3284,16 @@ static int handle_no_error(struct st_query *q)
q->expected_errno[0].code.errnum != 0)
{
/* Error code we wanted was != 0, i.e. not an expected success */
verbose_msg("query '%s' succeeded - should have failed with errno %d...",
q->query, q->expected_errno[0].code.errnum);
die("query '%s' succeeded - should have failed with errno %d...",
q->query, q->expected_errno[0].code.errnum);
DBUG_RETURN(1);
}
else if (q->expected_errno[0].type == ERR_SQLSTATE &&
strcmp(q->expected_errno[0].code.sqlstate,"00000") != 0)
{
/* SQLSTATE we wanted was != "00000", i.e. not an expected success */
verbose_msg("query '%s' succeeded - should have failed with sqlstate %s...",
q->query, q->expected_errno[0].code.sqlstate);
die("query '%s' succeeded - should have failed with sqlstate %s...",
q->query, q->expected_errno[0].code.sqlstate);
DBUG_RETURN(1);
}
......@@ -3312,7 +3313,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
{
int error= 0; /* Function return code if "goto end;" */
int err; /* Temporary storage of return code from calls */
int query_len, got_error_on_execute;
int query_len;
ulonglong num_rows;
char *query;
MYSQL_RES *res= NULL; /* Note that here 'res' is meta data result set */
......@@ -3328,7 +3329,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
*/
if (!(stmt= mysql_stmt_init(mysql)))
die("unable init stmt structure");
if (q->type != Q_EVAL)
{
query= q->query;
......@@ -3369,30 +3370,21 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
if (err != 0)
{
if (q->abort_on_error)
{
die("query '%s' failed: %d: %s", query,
mysql_stmt_errno(stmt), mysql_stmt_error(stmt));
}
else
{
/*
Preparing is part of normal execution and some errors may be expected
*/
error= handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt),
ds);
goto end;
}
/*
Preparing is part of normal execution and some errors may be expected
*/
if (handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds))
error= 1;
goto end;
}
/* We may have got warnings already, collect them if any */
/* FIXME we only want this if the statement succeeds I think */
if (!disable_ps_warnings)
run_query_stmt_handle_warnings(mysql, ds);
/*
No need to call mysql_stmt_bind_param() because we have no
No need to call mysql_stmt_bind_param() because we have no
parameter markers.
To optimize performance we use a global 'stmt' that is initiated
......@@ -3401,24 +3393,13 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
prepared statement.
*/
if ((got_error_on_execute= mysql_stmt_execute(stmt)) != 0) /* 0 == Success */
if (mysql_stmt_execute(stmt) != 0) /* 0 == Success */
{
if (q->abort_on_error)
{
/* We got an error, unexpected */
die("unable to execute statement '%s': "
"%s (mysql_stmt_errno=%d returned=%d)",
query, mysql_stmt_error(stmt),
mysql_stmt_errno(stmt), got_error_on_execute);
}
else
{
/* We got an error, maybe expected */
error= handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt),
ds);
goto end;
}
/* We got an error, maybe expected */
if (handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds))
error= 1;
goto end;
}
/*
......@@ -3428,11 +3409,10 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
*/
{
my_bool one= 1;
if (mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH,
(void*) &one) != 0)
if ((err= mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH,
(void*) &one)) != 0)
die("unable to set stmt attribute "
"'STMT_ATTR_UPDATE_MAX_LENGTH': %s (returned=%d)",
query, err);
"'STMT_ATTR_UPDATE_MAX_LENGTH' err: %d", err);
}
/*
......@@ -3441,22 +3421,11 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
*/
if ((err= mysql_stmt_store_result(stmt)) != 0)
{
if (q->abort_on_error)
{
/* We got an error, unexpected */
die("unable to execute statement '%s': "
"%s (mysql_stmt_errno=%d returned=%d)",
query, mysql_stmt_error(stmt),
mysql_stmt_errno(stmt), got_error_on_execute);
}
else
{
/* We got an error, maybe expected */
error= handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt),
ds);
goto end;
}
/* We got an error, maybe expected */
if(handle_error(query, q, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds))
error = 1;
goto end;
}
/* If we got here the statement was both executed and read succeesfully */
......@@ -3480,8 +3449,6 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
MYSQL_FIELD *field= mysql_fetch_fields(res);
uint num_fields= mysql_num_fields(res);
/* FIXME check error from the above? */
if (display_metadata)
run_query_display_metadata(field, num_fields, ds);
......@@ -3634,9 +3601,6 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
mysql_free_result(res); /* Free normal result set with meta data */
last_result= 0; /* FIXME have no idea what this is about... */
if (err >= 1)
mysql_error(mysql); /* FIXME strange, has no effect... */
end:
free_replace();
last_result=0;
......@@ -3727,8 +3691,8 @@ static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds)
{
MYSQL_RES *warn_res= mysql_store_result(mysql);
if (!warn_res)
verbose_msg("Warning count is %u but didn't get any warnings",
count);
die("Warning count is %u but didn't get any warnings",
count);
else
{
dynstr_append_mem(ds, "Warnings:\n", 10);
......
mysql-test/r/mysqltest.result
View file @ 83016f14
......@@ -134,7 +134,6 @@ select 1146 as "after_!errno_masked_error" ;
after_!errno_masked_error
1146
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000...
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1000...
garbage ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
select 1064 as "after_--enable_abort_on_error" ;
......@@ -143,7 +142,6 @@ after_--enable_abort_on_error
select 3 from t1 ;
ERROR 42S02: Table 'test.t1' doesn't exist
mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146 instead of 1064...
mysqltest: At line 1: query 'select 3 from t1' failed: 1146: Table 'test.t1' doesn't exist
hello
hello
;;;;;;;;
......
mysql-test/r/sp-error.result
View file @ 83016f14
......@@ -692,6 +692,7 @@ END P1|
call SP001();
TEMP_SUM
0
ERROR 24000: Cursor is not open
drop procedure SP001;
drop table t1, t2;
drop function if exists bug11394|
......
mysql-test/t/sp-error.test
View file @ 83016f14
......@@ -991,6 +991,7 @@ P1: BEGIN
SELECT 'end of proc';
END P1|
delimiter ;|
--error 1326
call SP001();
drop procedure SP001;
drop table t1, t2;
......@@ -1187,7 +1188,30 @@ delimiter ;|
create trigger bug12712
before insert on t1 for each row set session autocommit = 0;
#
# BUG#9367: Stored procedures: client hang after "show warnings"
#
--disable_parsing
--disable_warnings
drop procedure if exists bug9367;
--enable_warnings
create table t1 (s1 int);
select s1 from t1;
delimiter |;
create procedure bug9367()
begin
declare v int;
declare c cursor for select s1 from t1;
open c;
show warnings;
fetch c into v;
select v;
end|
delimiter ;|
call bug9367();
drop procedure bug9367;
drop table t1;
--enable_parsing
#
# BUG#NNNN: New bug synopsis
#
......
sql/sql_db.cc
View file @ 83016f14
......@@ -440,7 +440,8 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
error= 0;
send_ok(thd);
if (!silent)
send_ok(thd);
goto exit;
}
else
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7