Commit c21c89cd authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

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

sql_show.cc	#define USE_RAID removed
parent 4949aea3

include/raid.h

+13 −6
Original line number Diff line number Diff line
@@ -25,7 +25,15 @@ 


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__

#pragma interface			/* gcc class implementation */
@@ -84,7 +92,6 @@ extern "C" { 
  int my_raid_close(File, myf MyFlags);

  int my_raid_fstat(int Filedes, struct stat *buf,  myf MyFlags);



  const char *my_raid_type(int raid_type);



#ifdef __cplusplus

}

sql/sql_show.cc

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include "sql_select.h"                         // For select_describe

#include "sql_acl.h"

#include <my_dir.h>

#undef USE_RAID

#define USE_RAID



#ifdef HAVE_BERKELEY_DB

#include "ha_berkeley.h"			// For berkeley_show_logs