Browse Source

merge of 5.1-main to 5.1-bugteam

pull/374/head
Georgi Kodinov 18 years ago
parent
commit
c7fc78c3b2
  1. 10
      configure.in
  2. 1
      mysql-test/suite/ndb/t/disabled.def
  3. 1
      mysql-test/suite/rpl_ndb/t/disabled.def

10
configure.in

@ -617,19 +617,19 @@ fi
AC_MSG_CHECKING(whether features provided by the user community should be included.)
AC_ARG_ENABLE(community-features,
AC_HELP_STRING(
[--enable-community-features],
[Enable additional features provided by the user community.]),
[--disable-community-features],
[Disable additional features provided by the user community.]),
[ ENABLE_COMMUNITY_FEATURES=$enableval ],
[ ENABLE_COMMUNITY_FEATURES=no ]
[ ENABLE_COMMUNITY_FEATURES=yes ]
)
if test "$ENABLE_COMMUNITY_FEATURES" = "yes"
then
AC_DEFINE([COMMUNITY_SERVER], [1],
[Whether features provided by the user community should be included])
AC_MSG_RESULT([yes, community server])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no, enterprise server])
AC_MSG_RESULT([no])
fi
AC_ARG_WITH(server-suffix,

1
mysql-test/suite/ndb/t/disabled.def

@ -12,5 +12,6 @@
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms
ndb_index_ordered : Bug#38370 The test ndb.ndb_index_ordered fails with the community features on
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

1
mysql-test/suite/rpl_ndb/t/disabled.def

@ -12,5 +12,6 @@
rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular replication.
rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
rpl_row_basic_7ndb : Bug#38369 rpl_ndb.rpl_row_basic_7ndb fails
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
Loading…
Cancel
Save