database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

raid.h moved my_raid_type() out of #ifdef USE_RAID

Browse Source 
sql_show.cc	#define USE_RAID removed
This commit is contained in:
serg@serg.mysql.com
2000-12-23 23:26:54 +01:00
parent 4949aea345
commit c21c89cd67
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/raid.h
View File

@ -25,7 +25,15 @@
extern const char *raid_type_string[]; extern const char *raid_type_string[];
#if defined(USE_RAID) #ifdef __cplusplus
extern "C" {
#endif
const char *my_raid_type(int raid_type);
#ifdef __cplusplus
}
#endif
#ifdef USE_RAID
#ifdef __GNUC__ #ifdef __GNUC__
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
@ -84,7 +92,6 @@ extern "C" {
int my_raid_close(File, myf MyFlags); int my_raid_close(File, myf MyFlags);
int my_raid_fstat(int Filedes, struct stat *buf, myf MyFlags); int my_raid_fstat(int Filedes, struct stat *buf, myf MyFlags);
const char *my_raid_type(int raid_type);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
sql/sql_show.cc
View File

@ -21,8 +21,6 @@
#include "sql_select.h" // For select_describe #include "sql_select.h" // For select_describe
#include "sql_acl.h" #include "sql_acl.h"
#include <my_dir.h> #include <my_dir.h>
#undef USE_RAID
#define USE_RAID
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
#include "ha_berkeley.h" // For berkeley_show_logs #include "ha_berkeley.h" // For berkeley_show_logs