summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-07-16 15:37:38 +0300
committerGeorgi Kodinov <joro@sun.com>2009-07-16 15:37:38 +0300
commit097c7b38c83134092c0820b6129f1d29603b6d16 (patch)
tree8355983a13f35920e48a43d2d8a2b35a2eee92d7 /client
parentb7445ff687db2bba4785d9475865039940d6aa05 (diff)
downloadmariadb-git-097c7b38c83134092c0820b6129f1d29603b6d16.tar.gz
Bug #45287: phase 2 : 5.0 64 bit compilation warnings
Fixed various compilation warnings when compiling on a 64 bit windows.
Diffstat (limited to 'client')
-rw-r--r--client/mysql_upgrade.c2
-rw-r--r--client/mysqldump.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index e3500c81fb9..ff414fff592 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -387,7 +387,7 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
last_fn_libchar -= 6;
}
- len= last_fn_libchar - self_name;
+ len= (int) (last_fn_libchar - self_name);
my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",
len, self_name, FN_LIBCHAR, tool_name);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index fa6c21ed273..1918a657316 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -3122,7 +3122,7 @@ static my_bool dump_all_views_in_db(char *database)
for (numrows= 0 ; (table= getTableName(1)); )
{
char *end= strmov(afterdot, table);
- if (include_table(hash_key,end - hash_key))
+ if (include_table(hash_key,(uint) (end - hash_key)))
{
numrows++;
dynstr_append_checked(&query, quote_name(table, table_buff, 1));
@@ -3143,7 +3143,7 @@ static my_bool dump_all_views_in_db(char *database)
while ((table= getTableName(0)))
{
char *end= strmov(afterdot, table);
- if (include_table(hash_key, end - hash_key))
+ if (include_table(hash_key, (uint) (end - hash_key)))
get_view_structure(table, database);
}
if (opt_xml)