summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <georg@lmy002.wdf.sap.corp>2005-03-16 08:51:57 +0100
committerunknown <georg@lmy002.wdf.sap.corp>2005-03-16 08:51:57 +0100
commit0cd045ca4978fdcaac199ac67a2a841760e990a5 (patch)
treecdf92f4cc0fe3e71842ff688c056169648a70124
parent2a0b2e93e4300f44c56a513e41cb34ee81b09eb1 (diff)
downloadmariadb-git-0cd045ca4978fdcaac199ac67a2a841760e990a5.tar.gz
typecast fix for windows 64-bit compilation error
BitKeeper/etc/ignore: Added VC++Files/client/mysql_amd64.dsp to the ignore list
-rw-r--r--.bzrignore1
-rw-r--r--client/mysql.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index d2aa16da0a3..02a97d7d1af 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1106,3 +1106,4 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
+VC++Files/client/mysql_amd64.dsp
diff --git a/client/mysql.cc b/client/mysql.cc
index 16b26cd745d..a1071daffea 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2154,7 +2154,7 @@ print_table_data_xml(MYSQL_RES *result)
for (uint i=0; i < mysql_num_fields(result); i++)
{
tee_fprintf(PAGER, "\t<field name=\"");
- xmlencode_print(fields[i].name, strlen(fields[i].name));
+ xmlencode_print(fields[i].name, (uint) strlen(fields[i].name));
tee_fprintf(PAGER, "\">");
xmlencode_print(cur[i], lengths[i]);
tee_fprintf(PAGER, "</field>\n");