diff options
author | Magnus Svensson <msvensson@mysql.com> | 2008-08-09 10:52:50 +0200 |
---|---|---|
committer | Magnus Svensson <msvensson@mysql.com> | 2008-08-09 10:52:50 +0200 |
commit | 5a9938e584132b46fa4820abade187c487a0062b (patch) | |
tree | 44e443bda4418331d626400ba7b099d00e3eff5b /client/mysqltest.cc | |
parent | d7f846be94176b3f13734fbdc360336fb79c5104 (diff) | |
download | mariadb-git-5a9938e584132b46fa4820abade187c487a0062b.tar.gz |
Fix warnings in mysqltest
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r-- | client/mysqltest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 7b90526271b..87557d46053 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -546,8 +546,8 @@ public: DBUG_ASSERT(ds->str); if (fwrite(ds->str, 1, ds->length, m_file) != ds->length) - die("Failed to write %d bytes to '%s', errno: %d", - ds->length, m_file_name, errno); + die("Failed to write %lu bytes to '%s', errno: %d", + (unsigned long)ds->length, m_file_name, errno); m_bytes_written+= ds->length; DBUG_VOID_RETURN; } @@ -585,7 +585,8 @@ public: DBUG_VOID_RETURN; } - DBUG_PRINT("info", ("Read %d bytes from file, buf: %s", bytes, buf)); + DBUG_PRINT("info", ("Read %lu bytes from file, buf: %s", + (unsigned long)bytes, buf)); char* show_from= buf + bytes; while(show_from > buf && lines > 0 ) @@ -2291,7 +2292,7 @@ void eval_expr(VAR *v, const char *p, const char **p_end) const char* end= *p_end + 1; if (end < expected_end) die("Found junk '%.*s' after $variable in expression", - expected_end - end - 1, end); + (int)(expected_end - end - 1), end); DBUG_VOID_RETURN; } |