diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2006-11-27 18:16:08 +0200 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2006-11-27 18:16:08 +0200 |
| commit | 0e149b717029cf5ee5b34b3f7c5249cc534a3e1c (patch) | |
| tree | 20c7910ad3251fb39027f6528cd4c0524220a1a0 /client | |
| parent | 313f23a93af801ca368fd5f3123f952ab2b8da68 (diff) | |
| download | mariadb-git-0e149b717029cf5ee5b34b3f7c5249cc534a3e1c.tar.gz | |
Removed compiler warnings
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 4 | ||||
| -rw-r--r-- | client/mysqlslap.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index f812764b97c..4a32d1617c2 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1560,8 +1560,8 @@ static uint dump_routines_for_db(char *db) if the user has EXECUTE privilege he see routine names, but NOT the routine body of other routines that are not the creator of! */ - DBUG_PRINT("info",("length of body for %s row[2] '%s' is %d", - routine_name, row[2], strlen(row[2]))); + DBUG_PRINT("info",("length of body for %s row[2] '%s' is %ld", + routine_name, row[2], (long) strlen(row[2]))); if (strlen(row[2])) { char *query_str= NULL; diff --git a/client/mysqlslap.c b/client/mysqlslap.c index c2d3a5866e0..cba6f3009be 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -592,7 +592,7 @@ get_random_string(char *buf) DBUG_ENTER("get_random_string"); for (x= RAND_STRING_SIZE; x > 0; x--) *buf_ptr++= ALPHANUMERICS[random() % ALPHANUMERICS_SIZE]; - DBUG_PRINT("info", ("random string: '%*s'", buf_ptr - buf, buf)); + DBUG_PRINT("info", ("random string: '%*s'", (int) (buf_ptr - buf), buf)); DBUG_RETURN(buf_ptr - buf); } diff --git a/client/mysqltest.c b/client/mysqltest.c index b46a337959a..286de17a00e 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -893,8 +893,8 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname) die(NullS); if (!eval_result && (uint) stat_info.st_size != ds->length) { - DBUG_PRINT("info",("Size differs: result size: %u file size: %llu", - ds->length, stat_info.st_size)); + DBUG_PRINT("info",("Size differs: result size: %u file size: %lu", + ds->length, (ulong) stat_info.st_size)); DBUG_PRINT("info",("result: '%s'", ds->str)); DBUG_RETURN(RESULT_LENGTH_MISMATCH); } @@ -3077,14 +3077,14 @@ void do_connect(struct st_command *command) else if (!strncmp(con_options, "COMPRESS", 8)) con_compress= 1; else - die("Illegal option to connect: %.*s", end - con_options, con_options); + die("Illegal option to connect: %.*s", (int) (end - con_options), con_options); /* Process next option */ con_options= end; } if (next_con == connections_end) - die("Connection limit exhausted, you can have max %d connections", - (sizeof(connections)/sizeof(struct st_connection))); + die("Connection limit exhausted, you can have max %ld connections", + (long) (sizeof(connections)/sizeof(struct st_connection))); if (find_connection_by_name(ds_connection_name.str)) die("Connection %s already exists", ds_connection_name.str); |