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

Merge

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
This commit is contained in:
unknown
2005-05-08 22:52:55 +02:00
parent 6923146084 c0f4ae6be9
commit b40842f262
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@@ -181,6 +181,7 @@ mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
mwagner@here.mwagner.org mwagner@here.mwagner.org
mwagner@mysql.com mwagner@mysql.com
mwagner@ultrafly.mysql.com
mwagner@work.mysql.com mwagner@work.mysql.com
mydev@mysql.com mydev@mysql.com
mysql@home.(none) mysql@home.(none)

5
ndb/src/cw/cpcd/Process.cpp
View File

@@ -220,8 +220,11 @@ set_ulimit(const BaseString & pair){
if(!(list[1].trim() == "unlimited")){ if(!(list[1].trim() == "unlimited")){
value = atoi(list[1].c_str()); value = atoi(list[1].c_str());
} }
#if defined(__INTEL_COMPILER)
struct rlimit64 rlp;
#else
struct rlimit rlp; struct rlimit rlp;
#endif
#define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }} #define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }}
if(list[0].trim() == "c"){ if(list[0].trim() == "c"){

4
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
View File

@@ -799,7 +799,11 @@ 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",

2
sql/ha_blackhole.cc
View File

@@ -19,7 +19,7 @@
#pragma implementation // gcc: Class implementation #pragma implementation // gcc: Class implementation
#endif #endif
#include <mysql_priv.h> #include "mysql_priv.h"
#ifdef HAVE_BLACKHOLE_DB #ifdef HAVE_BLACKHOLE_DB
#include "ha_blackhole.h" #include "ha_blackhole.h"