Commit 44589256 authored by unknown's avatar unknown
Browse files

Added some missing casts and changed a define for alloca(). 


client/mysqldump.c:
  Added casts.
include/my_sys.h:
  Define for alloca() changed for Metrowerks compiler.
myisam/rt_split.c:
  Added cast.
parent 5dd49439

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -2321,9 +2321,9 @@ static int dump_selected_tables(char *db, char **table_names, int tables) 
  {

    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));

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ extern char *my_strdup_with_length(const byte *from, uint length, 
#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

myisam/rt_split.c

+3 −2
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ int rtree_split_page(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key, 


  n_dim = keyinfo->keysegs / 2;

  

  if (!(coord_buf= my_alloca(n_dim * 2 * sizeof(double) * (max_keys + 1 + 4) +

  if (!(coord_buf= (double*) my_alloca(n_dim * 2 * sizeof(double) *

				       (max_keys + 1 + 4) +

				       sizeof(SplitStruct) * (max_keys + 1))))

    return -1;