database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source
This commit is contained in:
jani@a193-229-222-105.elisa-laajakaista.fi
2005-07-20 13:27:57 +03:00
parent 8564322500
commit 0f7639ba15
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqldump.c
View File

@ -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); const char *table_name= hash_element(&dump_tables, i);
DBUG_PRINT("info",("Dumping table %s", table_name)); DBUG_PRINT("info",("Dumping table %s", table_name));
numrows= getTableStructure(table_name, db); numrows= getTableStructure((char*) table_name, db);
if (!dFlag && numrows > 0) if (!dFlag && numrows > 0)
dumpTable(numrows, table_name); dumpTable(numrows, (char*) table_name);
} }
hash_free(&dump_tables); hash_free(&dump_tables);
my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));

2
include/my_sys.h
View File

@ -165,7 +165,7 @@ extern char *my_strdup_with_length(const byte *from, uint length,
#endif /* _AIX */ #endif /* _AIX */
#if defined(__MWERKS__) #if defined(__MWERKS__)
#undef alloca #undef alloca
#define alloca __alloca #define alloca _alloca
#endif /* __MWERKS__ */ #endif /* __MWERKS__ */
#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca) #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
#define alloca __builtin_alloca #define alloca __builtin_alloca

5
myisam/rt_split.c
View File

@ -267,8 +267,9 @@ int rtree_split_page(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key,
n_dim = keyinfo->keysegs / 2; 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) *
sizeof(SplitStruct) * (max_keys + 1)))) (max_keys + 1 + 4) +
sizeof(SplitStruct) * (max_keys + 1))))
return -1; return -1;
task= (SplitStruct *)(coord_buf + n_dim * 2 * (max_keys + 1 + 4)); task= (SplitStruct *)(coord_buf + n_dim * 2 * (max_keys + 1 + 4));