bk commit into 4.1 tree (jani:1.2328)

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani 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.2328 05/07/20 13:27:57 jani@stripped +3 -0
  Added some missing casts and changed a define for alloca().

  myisam/rt_split.c
    1.12 05/07/20 13:27:52 jani@stripped +3 -2
    Added cast.

  include/my_sys.h
    1.138 05/07/20 13:27:52 jani@stripped +1 -1
    Define for alloca() changed for Metrowerks compiler.

  client/mysqldump.c
    1.194 05/07/20 13:27:52 jani@stripped +2 -2
    Added casts.

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-4.1

--- 1.193/client/mysqldump.c	2005-07-01 13:00:54 +03:00
+++ 1.194/client/mysqldump.c	2005-07-20 13:27:52 +03:00
@@ -2321,9 +2321,9 @@
   {
     const char *table_name= hash_element(&dump_tables, i);
     DBUG_PRINT("info",("Dumping table %s", table_name));
-    numrows= getTableStructure(table_name, db);
+    numrows= getTableStructure((char*) table_name, db);
     if (!dFlag && numrows > 0)
-      dumpTable(numrows, table_name);
+      dumpTable(numrows, (char*) table_name);
   }
   hash_free(&dump_tables);
   my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));

--- 1.137/include/my_sys.h	2005-05-25 12:56:40 +03:00
+++ 1.138/include/my_sys.h	2005-07-20 13:27:52 +03:00
@@ -165,7 +165,7 @@
 #endif /* _AIX */
 #if defined(__MWERKS__)
 #undef alloca
-#define alloca __alloca
+#define alloca _alloca
 #endif /* __MWERKS__ */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
 #define alloca __builtin_alloca

--- 1.11/myisam/rt_split.c	2004-06-02 17:13:52 +03:00
+++ 1.12/myisam/rt_split.c	2005-07-20 13:27:52 +03:00
@@ -267,8 +267,9 @@
 
   n_dim = keyinfo->keysegs / 2;
   
-  if (!(coord_buf= my_alloca(n_dim * 2 * sizeof(double) * (max_keys + 1 + 4) +
-			     sizeof(SplitStruct) * (max_keys + 1))))
+  if (!(coord_buf= (double*) my_alloca(n_dim * 2 * sizeof(double) *
+				       (max_keys + 1 + 4) +
+				       sizeof(SplitStruct) * (max_keys + 1))))
     return -1;
 
   task= (SplitStruct *)(coord_buf + n_dim * 2 * (max_keys + 1 + 4));