database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug #43603 mysqltest command disable_abort_on_error does not affect all built-in commands

Browse Source 
After disable_abort_on_error, behaved as if --error was in effect
Add condition before die, as after queries
This commit is contained in:
Bjorn Munch
2010-03-22 11:28:57 +01:00
parent 9d313a5e24
commit 7f20e9fd06
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysqltest.cc
View File

@ -1081,6 +1081,7 @@ void handle_command_error(struct st_command *command, uint error)
command->first_word_len, command->query, error));
DBUG_VOID_RETURN;
}
if (command->expected_errors.count > 0)
die("command \"%.*s\" failed with wrong error: %d",
command->first_word_len, command->query, error);
}
@ -1352,14 +1353,14 @@ void log_msg(const char *fmt, ...)
*/
void cat_file(DYNAMIC_STRING* ds, const char* filename)
int cat_file(DYNAMIC_STRING* ds, const char* filename)
{
int fd;
size_t len;
char buff[512];
if ((fd= my_open(filename, O_RDONLY, MYF(0))) < 0)
die("Failed to open file '%s'", filename);
return 1;
while((len= my_read(fd, (uchar*)&buff,
sizeof(buff), MYF(0))) > 0)
{
@ -1383,6 +1384,7 @@ void cat_file(DYNAMIC_STRING* ds, const char* filename)
dynstr_append_mem(ds, start, p-start);
}
my_close(fd, MYF(0));
return 0;
}
@ -2722,6 +2724,7 @@ void do_exec(struct st_command *command)
else
{
dynstr_free(&ds_cmd);
if (command->expected_errors.count > 0)
die("command \"%s\" failed with wrong error: %d",
command->first_argument, status);
}
@ -3498,6 +3501,7 @@ void do_append_file(struct st_command *command)
void do_cat_file(struct st_command *command)
{
int error;
static DYNAMIC_STRING ds_filename;
const struct command_arg cat_file_args[] = {
{ "filename", ARG_STRING, TRUE, &ds_filename, "File to read from" }
@ -3512,8 +3516,8 @@ void do_cat_file(struct st_command *command)
DBUG_PRINT("info", ("Reading from, file: %s", ds_filename.str));
cat_file(&ds_res, ds_filename.str);
error= cat_file(&ds_res, ds_filename.str);
handle_command_error(command, error);
dynstr_free(&ds_filename);
DBUG_VOID_RETURN;
}

2
mysql-test/r/mysqltest.result
View File

@ -572,7 +572,7 @@ if things work as expected
Some data
for cat_file command
of mysqltest
mysqltest: At line 1: Failed to open file 'non_existing_file'
mysqltest: At line 1: command "cat_file" failed with error 1
mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists'
mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file'
mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file'

9
mysql-test/t/mysqltest.test
View File

@ -325,6 +325,15 @@ eval select $mysql_errno as "after_!errno_masked_error" ;
--error 1
--exec echo "disable_abort_on_error; error 1000; select 3 from t1; error 1000; select 3 from t1;" | $MYSQL_TEST 2>&1
# ----------------------------------------------------------------------------
# Check some non-query statements that would fail
# ----------------------------------------------------------------------------
--exec illegal_command
--cat_file does_not_exist
--perl
exit(1);
EOF
# ----------------------------------------------------------------------------
# Switch the abort on error on and check the effect on $mysql_errno
# ----------------------------------------------------------------------------