mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
58e2fde011
Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.
81 lines
3.3 KiB
Text
81 lines
3.3 KiB
Text
# For easier human reading (MTR doesn't care), please keep entries
|
|
# in alphabetical order. This also helps with merge conflict resolution.
|
|
|
|
binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
|
|
binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin
|
|
|
|
funcs_1.charset_collation_1 # depends on compile-time decisions
|
|
|
|
innodb.innodb_information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
|
|
|
|
main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
|
|
main.information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
|
|
main.innodb-autoinc* # Bug#47809 2009-10-04 joro innodb-autoinc.test fails with valgrind errors with the innodb plugin
|
|
main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
|
|
main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
|
|
main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically
|
|
main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled
|
|
main.plugin_load # Bug#47146
|
|
|
|
rpl.rpl_innodb_bug28430* # Bug#46029
|
|
rpl.rpl_innodb_bug30888* @solaris # Bug#47646 2009-09-25 alik rpl.rpl_innodb_bug30888 fails sporadically on Solaris
|
|
rpl.rpl_plugin_load* @solaris # Bug#47146
|
|
rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2
|
|
rpl.rpl_log_pos* # Bug#47743 2009-10-02 alik rpl.rpl_log_pos fails sporadically
|
|
rpl.rpl_trigger* # Bug#46656 2009-09-25 alik InnoDB plugin: memory leaks (Valgrind)
|
|
|
|
# Declare all NDB-tests in ndb and rpl_ndb test suites experimental.
|
|
# Usually the test cases from ndb and rpl_ndb test suites are not run in PB,
|
|
# but they run by gcov.
|
|
#
|
|
|
|
ndb.*
|
|
rpl_ndb.*
|
|
|
|
# Declare all NDB-tests in other test suites experimental.
|
|
|
|
stress.ddl_ndb
|
|
|
|
sys_vars.ndb_log_update_as_write_basic
|
|
sys_vars.have_ndbcluster_basic
|
|
sys_vars.ndb_log_updated_only_basic
|
|
|
|
funcs_1.ndb_storedproc_10
|
|
funcs_1.ndb_bitdata
|
|
funcs_1.ndb_trig_03
|
|
funcs_1.ndb_trig_0102
|
|
funcs_1.is_tables_ndb
|
|
funcs_1.is_columns_ndb
|
|
funcs_1.ndb_trig_0407
|
|
funcs_1.ndb_trig_1011ext
|
|
funcs_1.ndb_storedproc_06
|
|
funcs_1.ndb_views
|
|
funcs_1.is_cml_ndb
|
|
funcs_1.ndb_storedproc_02
|
|
funcs_1.ndb_storedproc_03
|
|
funcs_1.ndb_trig_03e
|
|
funcs_1.is_engines_ndb
|
|
funcs_1.ndb_trig_08
|
|
funcs_1.ndb_storedproc_07
|
|
funcs_1.ndb_storedproc_08
|
|
funcs_1.ndb_func_view
|
|
funcs_1.ndb_trig_09
|
|
funcs_1.ndb_cursors
|
|
|
|
funcs_2.ndb_charset
|
|
|
|
parts.partition_engine_ndb
|
|
parts.ndb_dd_backuprestore
|
|
parts.partition_value_ndb
|
|
parts.partition_mgm_lc2_ndb
|
|
parts.partition_alter1_2_ndb
|
|
parts.partition_alter1_1_ndb
|
|
parts.part_supported_sql_func_ndb
|
|
parts.partition_int_ndb
|
|
parts.partition_mgm_lc1_ndb
|
|
parts.partition_auto_increment_ndb
|
|
parts.partition_syntax_ndb
|
|
parts.partition_alter1_1_2_ndb
|
|
parts.partition_basic_ndb
|
|
parts.partition_mgm_lc0_ndb
|
|
|