bk commit into 5.0 tree (reggie:1.1926)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of . When  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.1926 05/06/06 11:34:52 reggie@monster. +4 -0
  fixes for compiler warnings from VC6

  mysys/my_handler.c
    1.22 05/06/06 11:34:46 reggie@monster. +1 -1
    add (my_bool) cast to make compiler happy

  mysys/default.c
    1.71 05/06/06 11:34:45 reggie@monster. +1 -1
    add (char*) cast to make compiler happy

  myisam/mi_create.c
    1.47 05/06/06 11:34:45 reggie@monster. +1 -1
    cast myisam_block_size down to uint16 to match the struct element block_length

  client/mysqltest.c
    1.142 05/06/06 11:34:45 reggie@monster. +6 -5
    undef popen prior to redefining it to avoid compiler warning
    cast len argument to replace_dynstr_append_mem to int.  This should be ok because the 
    replace_dynstr_append method uses strlen to accomplish the same thing.

# 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:	reggie
# Host:	monster.
# Root:	D:/Work/mysql5.0

--- 1.46/myisam/mi_create.c	2005-05-13 04:08:02 -05:00
+++ 1.47/myisam/mi_create.c	2005-06-06 11:34:45 -05:00
@@ -667,7 +667,7 @@
   {
     tmp_keydef.keysegs=1;
     tmp_keydef.flag=		HA_UNIQUE_CHECK;
-    tmp_keydef.block_length=	myisam_block_size;
+    tmp_keydef.block_length=	(uint16)myisam_block_size;
     tmp_keydef.keylength=	MI_UNIQUE_HASH_LENGTH + pointer;
     tmp_keydef.minlength=tmp_keydef.maxlength=tmp_keydef.keylength;
     tmp_keyseg.type=		MI_UNIQUE_HASH_TYPE;

--- 1.70/mysys/default.c	2005-05-18 19:13:30 -05:00
+++ 1.71/mysys/default.c	2005-06-06 11:34:45 -05:00
@@ -850,7 +850,7 @@
   *ptr++= "C:/";
 
   if (GetWindowsDirectory(system_dir,sizeof(system_dir)))
-    *ptr++= &system_dir;
+    *ptr++= (char*)&system_dir;
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
   /* Only VC7 and up */
   /* Only add shared system directory if different from default. */

--- 1.21/mysys/my_handler.c	2005-02-03 05:18:14 -06:00
+++ 1.22/mysys/my_handler.c	2005-06-06 11:34:46 -05:00
@@ -23,7 +23,7 @@
 {
   if (!part_key)
     return charset_info->coll->strnncollsp(charset_info, a, a_length,
-                                           b, b_length, !skip_end_space);
+                                           b, b_length, (my_bool)!skip_end_space);
   return charset_info->coll->strnncoll(charset_info, a, a_length,
                                        b, b_length, part_key);
 }

--- 1.141/client/mysqltest.c	2005-05-17 18:59:38 -05:00
+++ 1.142/client/mysqltest.c	2005-06-06 11:34:45 -05:00
@@ -246,6 +246,7 @@
 
 static char *subst_env_var(const char *cmd);
 static FILE *my_popen(const char *cmd, const char *mode);
+#undef popen
 #define popen(A,B) my_popen((A),(B))
 #endif /* __NETWARE__ */
 
@@ -2587,13 +2588,13 @@
       {
 	if (i)
 	  dynstr_append_mem(ds, "\t", 1);
-	replace_dynstr_append_mem(ds, val, len);
+	replace_dynstr_append_mem(ds, val, (int)len);
       }
       else
       {
 	dynstr_append(ds, fields[i].name);
 	dynstr_append_mem(ds, "\t", 1);
-	replace_dynstr_append_mem(ds, val, len);
+	replace_dynstr_append_mem(ds, val, (int)len);
 	dynstr_append_mem(ds, "\n", 1);
       }
     }
@@ -2960,7 +2961,7 @@
   int error= 0;             /* Function return code if "goto end;" */
   int err;                  /* Temporary storage of return code from calls */
   int query_len, got_error_on_execute;
-  uint num_rows;
+  ulonglong num_rows;
   char *query;
   MYSQL_RES *res= NULL;     /* Note that here 'res' is meta data result set */
   DYNAMIC_STRING *ds;
@@ -3215,13 +3216,13 @@
           {
             if (col_idx)                      /* No tab before first col */
               dynstr_append_mem(ds, "\t", 1);
-            replace_dynstr_append_mem(ds, val, len);
+            replace_dynstr_append_mem(ds, val, (int)len);
           }
           else
           {
             dynstr_append(ds, field[col_idx].name);
             dynstr_append_mem(ds, "\t", 1);
-            replace_dynstr_append_mem(ds, val, len);
+            replace_dynstr_append_mem(ds, val, (int)len);
             dynstr_append_mem(ds, "\n", 1);
           }
         }