summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@station.>2007-09-29 23:31:08 +0400
committerunknown <anozdrin/alik@station.>2007-09-29 23:31:08 +0400
commit25c7e4be1b321865fced927054452cf27c59fa58 (patch)
treeaef597dc3494eb195548604298bcce33bb53fbb6 /client/mysqltest.c
parent842fe93b0b5f25c1dd0edd9590279a8e5dd6bc1e (diff)
downloadmariadb-git-25c7e4be1b321865fced927054452cf27c59fa58.tar.gz
Fix compile warnings.
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 979c8de3656..0e45b2ac1d8 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1507,7 +1507,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
die("Failed to create temporary file for ds");
/* Write ds to temporary file and set file pos to beginning*/
- if (my_write(fd, ds->str, ds->length,
+ if (my_write(fd, (uchar *) ds->str, ds->length,
MYF(MY_FNABP | MY_WME)) ||
my_seek(fd, 0, SEEK_SET, MYF(0)) == MY_FILEPOS_ERROR)
{
@@ -1984,9 +1984,11 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
static DYNAMIC_STRING ds_col;
static DYNAMIC_STRING ds_row;
const struct command_arg query_get_value_args[] = {
- "query", ARG_STRING, TRUE, &ds_query, "Query to run",
- "column name", ARG_STRING, TRUE, &ds_col, "Name of column",
- "row number", ARG_STRING, TRUE, &ds_row, "Number for row",
+ {
+ "query", ARG_STRING, TRUE, &ds_query, "Query to run",
+ "column name", ARG_STRING, TRUE, &ds_col, "Name of column",
+ "row number", ARG_STRING, TRUE, &ds_row, "Number for row"
+ }
};
DBUG_ENTER("var_set_query_get_value");