#At file:///home/sven/bzr/merge/6.0-rpl_from_5.1-rpl/
2698 Sven Sandberg 2008-08-07 [merge]
please ignore - temporary commit
renamed:
mysql-test/include/have_federated_db.inc => mysql-test/suite/federated/have_federated_db.inc
modified:
client/mysqltest.c
configure.in
mysql-test/mysql-test-run.pl*
mysql-test/r/multi_update.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/parts/inc/partition_layout_check2.inc
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/t/partition_federated.test
=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c 2008-08-05 11:20:20 +0000
+++ b/client/mysqltest.c 2008-08-07 09:16:35 +0000
@@ -277,8 +277,8 @@ enum enum_commands {
Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP,
Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES,
- Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR, Q_LIST_FILES,
- Q_LIST_FILES_WRITE_FILE, Q_LIST_FILES_APPEND_FILE,
+ Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR,
+ Q_LIST_FILES, Q_LIST_FILES_WRITE_FILE, Q_LIST_FILES_APPEND_FILE,
Q_SEND_SHUTDOWN, Q_SHUTDOWN_SERVER,
Q_UNKNOWN, /* Unknown command. */
=== modified file 'configure.in'
--- a/configure.in 2008-08-05 11:20:20 +0000
+++ b/configure.in 2008-08-07 09:16:35 +0000
@@ -643,19 +643,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,
=== modified file 'mysql-test/mysql-test-run.pl' (properties changed: +x to -x)
--- a/mysql-test/mysql-test-run.pl 2008-08-05 11:20:20 +0000
+++ b/mysql-test/mysql-test-run.pl 2008-08-07 09:16:35 +0000
@@ -149,15 +149,23 @@ my $opt_build_thread= $ENV{'MTR_BUILD_TH
my $opt_record;
my $opt_report_features;
+
our $opt_check_testcases= 1;
my $opt_mark_progress;
my $opt_sleep;
+|<<<<<<< TREE
my $opt_testcase_timeout= 15; # 15 minutes
my $opt_suite_timeout = 360; # 6 hours
my $opt_shutdown_timeout= 10; # 10 seconds
my $opt_start_timeout = 180; # 180 seconds
+|=======
+my $opt_testcase_timeout= 15; # minutes
+my $opt_suite_timeout = 300; # minutes
+my $opt_shutdown_timeout= 10; # seconds
+my $opt_start_timeout = 180; # seconds
+|>>>>>>> MERGE-SOURCE
my $opt_start;
my $opt_start_dirty;
@@ -1694,7 +1702,8 @@ sub environment_setup {
# ----------------------------------------------------
my $file_mysql_fix_privilege_tables=
mtr_file_exists("$basedir/scripts/mysql_fix_privilege_tables.sql",
- "$basedir/share/mysql_fix_privilege_tables.sql");
+ "$basedir/share/mysql_fix_privilege_tables.sql",
+ "$basedir/share/mysql/mysql_fix_privilege_tables.sql");
$ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables;
# ----------------------------------------------------
@@ -2818,6 +2827,7 @@ sub run_testcase ($) {
if (defined $value){
mtr_verbose("Restoring $option to $value");
$ENV{$option}= $value;
+
} else {
mtr_verbose("Removing $option");
delete($ENV{$option});
=== modified file 'mysql-test/r/multi_update.result'
--- a/mysql-test/r/multi_update.result 2008-08-07 01:40:24 +0000
+++ b/mysql-test/r/multi_update.result 2008-08-07 09:16:35 +0000
@@ -627,7 +627,11 @@ a b
4 4
show master status /* there must be the UPDATE query event */;
File Position Binlog_Do_DB Binlog_Ignore_DB
+|<<<<<<< TREE
master-bin.000001 207
+|=======
+master-bin.000001 206
+|>>>>>>> MERGE-SOURCE
delete from t1;
delete from t2;
insert into t1 values (1,2),(3,4),(4,4);
@@ -637,7 +641,11 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t
ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
show master status /* there must be the UPDATE query event */;
File Position Binlog_Do_DB Binlog_Ignore_DB
+|<<<<<<< TREE
master-bin.000001 222
+|=======
+master-bin.000001 221
+|>>>>>>> MERGE-SOURCE
drop table t1, t2;
set @@session.binlog_format= @sav_binlog_format;
drop table if exists t1, t2, t3;
=== renamed file 'mysql-test/include/have_federated_db.inc' => 'mysql-test/suite/federated/have_federated_db.inc'
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def 2008-04-27 01:02:09 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def 2008-08-07 09:16:35 +0000
@@ -11,6 +11,7 @@
##############################################################################
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
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
=== modified file 'mysql-test/suite/parts/inc/partition_layout_check2.inc'
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc 2008-08-04 14:30:50 +0000
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc 2008-08-07 09:16:35 +0000
@@ -34,7 +34,11 @@ let $show_file= $MYSQLD_DATADIR/test/tmp
if ($do_file_tests)
{
+|<<<<<<< TREE
# List the files belonging to the table t1
+|=======
+ # List the files belonging to the table t1
+|>>>>>>> MERGE-SOURCE
let $ls_file= $MYSQLD_DATADIR/test/tmp2;
--list_files_write_file $ls_file $MYSQLD_DATADIR/test t1*
--chmod 0644 $ls_file
=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def 2008-07-22 14:16:22 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def 2008-08-07 09:16:35 +0000
@@ -12,6 +12,7 @@
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
rpl_ndb_circular_2ch : Bug#33849 COMMIT event missing in cluster circular replication.
rpl_ndb_innodb2ndb : Bug#34725 2008-02-26 hakank Currently failing.
rpl_ndb_extraCol : Bug #22045 2008-03-22 Got error 839 'Illegal null attribute' from NDBCLUSTER when 'Replace Into'
=== modified file 'mysql-test/t/partition_federated.test'
--- a/mysql-test/t/partition_federated.test 2008-07-23 12:03:59 +0000
+++ b/mysql-test/t/partition_federated.test 2008-08-07 09:16:35 +0000
@@ -3,7 +3,7 @@
#
-- source include/have_partition.inc
-- source include/not_embedded.inc
--- source include/have_federated_db.inc
+-- source suite/federated/have_federated_db.inc
--disable_warnings
drop table if exists t1;
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (sven:2698) Bug#37051 | Sven Sandberg | 7 Aug |
