database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge of 5.1-main to 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2008-07-25 18:06:47 +03:00
parent d09b5ab227 e113042588
commit c7fc78c3b2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

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

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

@ -12,5 +12,6 @@
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table 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_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 # 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
View File

@ -12,5 +12,6 @@
rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular replication. 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_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 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open