Commit 4422b071 authored by unknown's avatar unknown
Browse files

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 384456fc cb611552

ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp

+0 −4
Original line number Diff line number Diff line
@@ -799,11 +799,7 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){ 
      request->error = errno;

    return;

  }

#if defined(__INTEL_COMPILER)

  struct dirent64 * dp;

#else

  struct dirent * dp;

#endif

  while ((dp = readdir(dirp)) != NULL){

    if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) {

      BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s",

sql/gen_lex_hash.cc

+2 −2
Original line number Diff line number Diff line
@@ -459,8 +459,8 @@ int main(int argc,char **argv) 
  generate_find_structs();

  print_find_structs();



  printf("\static 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 sql_functions_max_len=%d;\n", max_len);

  printf("\nstatic unsigned int symbols_max_len=%d;\n\n", max_len2);



  printf("\

static inline SYMBOL *get_hash_symbol(const char *s,\n\