Commit 247f2318 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/bug9626

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build


mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged
parents 950481ec b5934bc1
...@@ -799,11 +799,7 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){ ...@@ -799,11 +799,7 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){
request->error = errno; request->error = errno;
return; return;
} }
#if defined(__INTEL_COMPILER)
struct dirent64 * dp;
#else
struct dirent * dp; struct dirent * dp;
#endif
while ((dp = readdir(dirp)) != NULL){ while ((dp = readdir(dirp)) != NULL){
if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) { if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) {
BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s", BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s",
......
...@@ -459,8 +459,8 @@ int main(int argc,char **argv) ...@@ -459,8 +459,8 @@ int main(int argc,char **argv)
generate_find_structs(); generate_find_structs();
print_find_structs(); print_find_structs();
printf("\static unsigned int sql_functions_max_len=%d;\n",max_len); printf("\nstatic unsigned int sql_functions_max_len=%d;\n", max_len);
printf("\static unsigned int symbols_max_len=%d;\n\n",max_len2); printf("\nstatic unsigned int symbols_max_len=%d;\n\n", max_len2);
printf("\ printf("\
static inline SYMBOL *get_hash_symbol(const char *s,\n\ static inline SYMBOL *get_hash_symbol(const char *s,\n\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment