summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:15:07 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:15:07 -0300
commit85bbcfee02996b42b6a63b881691f6aeb6967d6f (patch)
tree6a6d06ccca15bd33f316633d542c8be2470ffcca /include
parente83f1d37c497383f25aee772371692ea561190a4 (diff)
downloadmariadb-git-85bbcfee02996b42b6a63b881691f6aeb6967d6f.tar.gz
WL#5498: Remove dead and unused source code
Remove the ancient and dead raid code. By now, even the server side has been removed.
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h18
-rw-r--r--include/my_nosys.h2
-rw-r--r--include/my_sys.h2
-rw-r--r--include/myisam.h3
-rw-r--r--include/mysql_embed.h2
5 files changed, 3 insertions, 24 deletions
diff --git a/include/my_global.h b/include/my_global.h
index b7ec40fc2e0..33eaefefe62 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1125,22 +1125,6 @@ typedef long long intptr;
#define MY_ERRPTR ((void*)(intptr)1)
-#ifdef USE_RAID
-/*
- The following is done with a if to not get problems with pre-processors
- with late define evaluation
-*/
-#if SIZEOF_OFF_T == 4
-#define SYSTEM_SIZEOF_OFF_T 4
-#else
-#define SYSTEM_SIZEOF_OFF_T 8
-#endif
-#undef SIZEOF_OFF_T
-#define SIZEOF_OFF_T 8
-#else
-#define SYSTEM_SIZEOF_OFF_T SIZEOF_OFF_T
-#endif /* USE_RAID */
-
#if defined(_WIN32)
typedef unsigned long long my_off_t;
typedef unsigned long long os_off_t;
@@ -1699,8 +1683,6 @@ static inline double rint(double x)
#undef HAVE_SMEM /* No shared memory */
#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
-#define DONT_USE_RAID
-
#endif /* EMBEDDED_LIBRARY */
#endif /* my_global_h */
diff --git a/include/my_nosys.h b/include/my_nosys.h
index ecb60333830..96ba6d4c464 100644
--- a/include/my_nosys.h
+++ b/include/my_nosys.h
@@ -30,7 +30,7 @@ extern "C" {
#include <malloc.h>
#endif
-#undef my_read /* Can be predefined in raid.h */
+#undef my_read
#undef my_write
#undef my_seek
#define my_read(a,b,c,d) my_quick_read(a,b,c,d)
diff --git a/include/my_sys.h b/include/my_sys.h
index 369a6b5b82b..95689535be5 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -78,7 +78,7 @@ extern int my_errno; /* Last error in mysys */
#define MY_WAIT_IF_FULL 32 /* Wait and try again if disk full error */
#define MY_IGNORE_BADFD 32 /* my_sync: ignore 'bad descriptor' errors */
#define MY_SYNC_DIR 8192 /* my_create/delete/rename: sync directory */
-#define MY_RAID 64 /* Support for RAID */
+#define MY_UNUSED 64 /* Unused (was support for RAID) */
#define MY_FULL_IO 512 /* For my_read - loop intil I/O is complete */
#define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */
#define MY_LINK_WARNING 32 /* my_redel() gives warning if links */
diff --git a/include/myisam.h b/include/myisam.h
index 450b1cf366c..3efc65a900a 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -481,8 +481,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
const char * name, int rep_quick);
int change_to_newfile(const char * filename, const char * old_ext,
- const char * new_ext, uint raid_chunks,
- myf myflags);
+ const char * new_ext, myf myflags);
int lock_file(MI_CHECK *param, File file, my_off_t start, int lock_type,
const char *filetype, const char *filename);
void lock_memory(MI_CHECK *param);
diff --git a/include/mysql_embed.h b/include/mysql_embed.h
index b26b723381d..ae70b9723f8 100644
--- a/include/mysql_embed.h
+++ b/include/mysql_embed.h
@@ -28,7 +28,5 @@
#undef HAVE_SMEM /* No shared memory */
#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
-#define DONT_USE_RAID
-
#endif /* EMBEDDED_LIBRARY */
#endif /* MYSQL_EMBED_INCLUDED */