Commit 406fd12a authored by unknown's avatar unknown
Browse files

configure.in: 

  Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches


configure.in:
  Don't install ndb man pages if no ndb configured
CMakeLists.txt:
  Removed Cybozu patches
include/config-win.h:
  Removed Cybozu patches
win/README:
  Removed Cybozu patches
win/configure.js:
  Removed Cybozu patches
parent ffa3c301

CMakeLists.txt

+0 −3
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh 
IF(__NT__)

  ADD_DEFINITIONS(-D __NT__)

ENDIF(__NT__)

IF(CYBOZU)

  ADD_DEFINITIONS(-D CYBOZU)

ENDIF(CYBOZU)



# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")

configure.in

+9 −3
Original line number Diff line number Diff line
@@ -2376,12 +2376,18 @@ AC_ARG_WITH(man, 
    [with_man=yes]

)



if test "$with_man" = "yes"

if test X"$with_man" = Xyes

then

  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  if test X"$have_ndbcluster" = Xyes

  then

    man1_files=`ls $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

    man8_files=`ls $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  else

    man1_files=`ls $srcdir/man/*.1 | grep -v '/ndb' | sed -e 's;^.*man/;;'`

    man8_files=`ls $srcdir/man/*.8 | grep -v '/ndb' | sed -e 's;^.*man/;;'`

  fi

  man1_files=`echo $man1_files`

  man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  man8_files=`echo $man8_files`

else

  man_dirs=""

include/config-win.h

+0 −14
Original line number Diff line number Diff line
@@ -408,14 +408,8 @@ inline double ulonglong2double(ulonglong value) 
#define shared_memory_buffer_length 16000

#define default_shared_memory_base_name "MYSQL"



#ifdef CYBOZU

#define MYSQL_DEFAULT_CHARSET_NAME "utf8"

#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"

#define HAVE_UTF8_GENERAL_CS 1

#else

#define MYSQL_DEFAULT_CHARSET_NAME "latin1"

#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"

#endif



#define HAVE_SPATIAL 1

#define HAVE_RTREE_KEYS 1
@@ -426,10 +420,8 @@ inline double ulonglong2double(ulonglong value) 
/* Define charsets you want */

/* #undef HAVE_CHARSET_armscii8 */

/* #undef HAVE_CHARSET_ascii */

#ifndef CYBOZU

#define HAVE_CHARSET_big5 1

#define HAVE_CHARSET_cp1250 1

#endif

/* #undef HAVE_CHARSET_cp1251 */

/* #undef HAVE_CHARSET_cp1256 */

/* #undef HAVE_CHARSET_cp1257 */
@@ -438,33 +430,27 @@ inline double ulonglong2double(ulonglong value) 
/* #undef HAVE_CHARSET_cp866 */

#define HAVE_CHARSET_cp932 1

/* #undef HAVE_CHARSET_dec8 */

#ifndef CYBOZU

#define HAVE_CHARSET_eucjpms 1

#define HAVE_CHARSET_euckr 1

#define HAVE_CHARSET_gb2312 1

#define HAVE_CHARSET_gbk 1

#endif

/* #undef HAVE_CHARSET_greek */

/* #undef HAVE_CHARSET_hebrew */

/* #undef HAVE_CHARSET_hp8 */

/* #undef HAVE_CHARSET_keybcs2 */

/* #undef HAVE_CHARSET_koi8r */

/* #undef HAVE_CHARSET_koi8u */

#ifndef CYBOZU

#define HAVE_CHARSET_latin1 1

#define HAVE_CHARSET_latin2 1

#endif

/* #undef HAVE_CHARSET_latin5 */

/* #undef HAVE_CHARSET_latin7 */

/* #undef HAVE_CHARSET_macce */

/* #undef HAVE_CHARSET_macroman */

#define HAVE_CHARSET_sjis 1

/* #undef HAVE_CHARSET_swe7 */

#ifndef CYBOZU

#define HAVE_CHARSET_tis620 1

#define HAVE_CHARSET_ucs2 1

#define HAVE_CHARSET_ujis 1

#endif

#define HAVE_CHARSET_utf8 1

#define HAVE_UCA_COLLATIONS 1

win/README

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ The options right now are 
    MYSQL_SERVER_SUFFIX=<suffix>         Server suffix, default none

    COMPILATION_COMMENT=<comment>        Server comment, default "Source distribution"

    MYSQL_TCP_PORT=<port>                Server port, default 3306

    CYBOZU

    DISABLE_GRANT_OPTIONS                Disables the use of --init-file and --skip-grant-tables

                                         options of mysqld.exe

win/configure.js

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ try 
            case "WITH_INNOBASE_STORAGE_ENGINE":

            case "WITH_PARTITION_STORAGE_ENGINE":

            case "__NT__":

            case "CYBOZU":

            case "DISABLE_GRANT_OPTIONS":

                    configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");

                    break;