bk commit into 4.1 tree (georg:1.2085)

[Georg Richter]

Below is the list of changes that have just been committed into a local
4.1 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2085 05/03/07 09:47:24 georg@stripped +3 -0
  fixed conversion errors (Windows IA64 build)

  client/sql_string.cc
    1.20 05/03/07 09:47:18 georg@stripped +2 -2
    fixed conversion errors (Windows IA64 build)

  client/readline.cc
    1.11 05/03/07 09:47:18 georg@stripped +1 -1
    fixed conversion errors (Windows IA64 build)

  client/mysql.cc
    1.199 05/03/07 09:47:18 georg@stripped +5 -7
    fixed conversion errors (Windows IA64 build)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-4.1

--- 1.198/client/mysql.cc	2005-02-25 12:47:32 +01:00
+++ 1.199/client/mysql.cc	2005-03-07 09:47:18 +01:00
@@ -727,7 +727,7 @@
       strmov(delimiter, DEFAULT_DELIMITER);
     else
       strmake(delimiter, argument, sizeof(delimiter) - 1);
-    delimiter_length= strlen(delimiter);
+    delimiter_length= (uint)strlen(delimiter);
     delimiter_str= delimiter;
     break;
   case OPT_LOCAL_INFILE:
@@ -1663,7 +1663,7 @@
   if (!connected && reconnect())
     return 1;
 
-  if ((error= mysql_real_query_for_lazy(server_cmd,strlen(server_cmd))) ||
+  if ((error= mysql_real_query_for_lazy(server_cmd,(int)strlen(server_cmd))) ||
       (error= mysql_store_result_for_lazy(&result)))
     return error;
 
@@ -1749,7 +1749,7 @@
   for (i = 0; commands[i].name; i++)
   {
     end= strmov(buff, commands[i].name);
-    for (j= strlen(commands[i].name); j < 10; j++)
+    for (j= (int)strlen(commands[i].name); j < 10; j++)
       end= strmov(end, " ");
     if (commands[i].func)
       tee_fprintf(stdout, "%s(\\%c) %s\n", buff,
@@ -2126,7 +2126,7 @@
   mysql_field_seek(result,0);
 
   tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER);
-  xmlencode_print(glob_buffer.ptr(), strlen(glob_buffer.ptr()));
+  xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr()));
   tee_fputs("\">", PAGER);
 
   fields = mysql_fetch_fields(result);
@@ -2615,7 +2615,7 @@
     return 0;
   }
   strmake(delimiter, tmp, sizeof(delimiter) - 1);
-  delimiter_length= strlen(delimiter);
+  delimiter_length= (int)strlen(delimiter);
   delimiter_str= delimiter;
   return 0;
 }
@@ -2625,8 +2625,6 @@
 com_use(String *buffer __attribute__((unused)), char *line)
 {
   char *tmp, buff[FN_REFLEN + 1];
-  MYSQL_RES *res;
-  MYSQL_ROW row;
 
   bzero(buff, sizeof(buff));
   strmov(buff, line);

--- 1.10/client/readline.cc	2004-05-05 22:47:05 +02:00
+++ 1.11/client/readline.cc	2005-03-07 09:47:18 +01:00
@@ -108,7 +108,7 @@
 */
 static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str)
 {
-  uint old_length=buffer->end - buffer->buffer;
+  uint old_length=(uint)(buffer->end - buffer->buffer);
   uint length= (uint) strlen(str);
   if (!(buffer->buffer= buffer->start_of_line= buffer->end_of_line=
 	(char*)my_realloc(buffer->buffer, old_length+length+2,

--- 1.19/client/sql_string.cc	2004-02-02 17:25:34 +01:00
+++ 1.20/client/sql_string.cc	2005-03-07 09:47:18 +01:00
@@ -544,7 +544,7 @@
 
 void String::qs_append(const char *str)
 {
-  int len = strlen(str);
+  int len = (int)strlen(str);
   memcpy(Ptr + str_length, str, len + 1);
   str_length += len;
 }
@@ -553,7 +553,7 @@
 {
   char *buff = Ptr + str_length;
   sprintf(buff,"%.14g", d);
-  str_length += strlen(buff);
+  str_length += (int)strlen(buff);
 }
 
 void String::qs_append(double *d)