summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-02-19 18:19:47 +0100
committerunknown <msvensson@pilot.blaudden>2007-02-19 18:19:47 +0100
commit8d7e8d971580c4b35d49e9dcb7b27834ff29fd7e (patch)
tree50be0170304b3894684d3191883944e215c7ed3e /client
parentd329b1f2039b4c00016609721bd414b0c1a6e160 (diff)
downloadmariadb-git-8d7e8d971580c4b35d49e9dcb7b27834ff29fd7e.tar.gz
Add cat_file command to mysqltest
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c48
1 files changed, 47 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 86ef3525d1e..04d1f59dd4c 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -273,7 +273,7 @@ enum enum_commands {
Q_DISABLE_PARSING, Q_ENABLE_PARSING,
Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT,
- Q_CHMOD_FILE, Q_APPEND_FILE,
+ Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE,
Q_UNKNOWN, /* Unknown command. */
Q_COMMENT, /* Comments, ignored. */
@@ -358,6 +358,7 @@ const char *command_names[]=
"exit",
"chmod",
"append_file",
+ "cat_file",
0
};
@@ -2163,6 +2164,50 @@ void do_append_file(struct st_command *command)
/*
SYNOPSIS
+ do_cat_file
+ command called command
+
+ DESCRIPTION
+ cat_file <file_name>;
+
+ Print the given file to result log
+
+*/
+
+void do_cat_file(struct st_command *command)
+{
+ int fd;
+ uint len;
+ byte buff[512];
+ static DYNAMIC_STRING ds_filename;
+ const struct command_arg cat_file_args[] = {
+ "filename", ARG_STRING, TRUE, &ds_filename, "File to read from"
+ };
+ DBUG_ENTER("do_cat_file");
+
+ check_command_args(command,
+ command->first_argument,
+ cat_file_args,
+ sizeof(cat_file_args)/sizeof(struct command_arg),
+ ' ');
+
+ DBUG_PRINT("info", ("Reading from, file: %s", ds_filename.str));
+
+ if ((fd= my_open(ds_filename.str, O_RDONLY, MYF(0))) < 0)
+ die("Failed to open file %s", ds_filename.str);
+ while((len= my_read(fd, &buff,
+ sizeof(buff), MYF(0))) > 0)
+ {
+ dynstr_append_mem(&ds_res, buff, len);
+ }
+ my_close(fd, MYF(0));
+ dynstr_free(&ds_filename);
+ DBUG_VOID_RETURN;
+}
+
+
+/*
+ SYNOPSIS
do_perl
command command handle
@@ -5927,6 +5972,7 @@ int main(int argc, char **argv)
case Q_FILE_EXIST: do_file_exist(command); break;
case Q_WRITE_FILE: do_write_file(command); break;
case Q_APPEND_FILE: do_append_file(command); break;
+ case Q_CAT_FILE: do_cat_file(command); break;
case Q_COPY_FILE: do_copy_file(command); break;
case Q_CHMOD_FILE: do_chmod_file(command); break;
case Q_PERL: do_perl(command); break;