diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
| commit | dd9119be20709267f7603c581ce53fbe9f96259c (patch) | |
| tree | 8414a0bf16f74515368a6a4ebc7ea528e8f982a2 /config | |
| parent | 92e572e86c8a3c1c87f9c44565412ff966a96d97 (diff) | |
| parent | 1f18af1acb41c32680e57d64cd29053721d5e533 (diff) | |
| download | mariadb-git-dd9119be20709267f7603c581ce53fbe9f96259c.tar.gz | |
Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009)
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/character_sets.m4 | 3 | ||||
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4 index a9f7bd73858..24bdd92b083 100644 --- a/config/ac-macros/character_sets.m4 +++ b/config/ac-macros/character_sets.m4 @@ -5,6 +5,9 @@ dnl you must also create strings/ctype-$charset_name.c AC_DIVERT_PUSH(0) +# Any changes to the available character sets must also go into +# include/config-win.h + define(CHARSETS_AVAILABLE0,binary) define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257) define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjpms euckr gb2312 gbk geostd8) diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 9df96a7750b..5ee136f2266 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -280,7 +280,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ esac # libndbclient versioning when linked with GNU ld. - if $LD --version 2>/dev/null|grep -q GNU; then + if $LD --version 2>/dev/null|grep GNU >/dev/null 2>&1 ; then NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver" AC_CONFIG_FILES(storage/ndb/src/libndb.ver) fi |