remove needless -DMYSQL51 macro.

mroonga · Aug 12, 2011 · d6e4f5a · d6e4f5a
1 parent 777d34a
commit d6e4f5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/configure.ac b/configure.ac
@@ -73,16 +73,6 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
     AC_MSG_ERROR([failed to run "$ac_mysql_config": $plugindir])
   fi
   MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
-  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
-  MYSQL_CFLAGS="$MYSQL_CFLAGS $($ac_mysql_config --cflags)"
-  if test $ac_mysql_major_version -lt 55; then
-    MYSQL_VERSION_CFLAGS="-DMYSQL51"
-    AC_SUBST(MYSQL_VERSION_CFLAGS)
-    MYSQL_VERSION="5.1"
-  else
-    MYSQL_VERSION="5.5"
-  fi
-  AC_SUBST(MYSQL_VERSION)
   AC_SUBST(plugindir)
 ])
 

diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -38,10 +38,10 @@
 #define MYSQL_SERVER 1
 #include "mysql_version.h"
 
-#ifdef MYSQL51
+#if MYSQL_VERSION_ID < 50500
 #  include <mysql_priv.h>
 #  include <mysql/plugin.h>
-#else /* MYSQL51 */
+#else
 #  include <sql_priv.h>
 #  include <sql_class.h>
 #  include <probes_mysql.h>