3618 Alexander Nozdrin 2009-09-25
Cherry-pick a patch from mysql-pe that rollbacks patch for Bug#45989.
modified:
sql/sql_select.cc
3617 Alexander Nozdrin 2009-09-25
Update list of experimental test cases.
Disable mdl_sync.test to run with the embedded server.
modified:
mysql-test/collections/default.experimental
mysql-test/t/mdl_sync.test
3616 Alexander Nozdrin 2009-09-25 [merge]
Merge from mysql-next-mr-alik.
added:
mysql-test/collections/mysql-next-mr.push
mysql-test/collections/mysql-trunk.push
modified:
.bzr-mysql/default.conf
.bzrignore
mysql-test/collections/default.experimental
3615 Marc Alff 2009-09-25 [merge]
Merging SIGNAL/RESIGNAL from 5.4 to 6.0 (where it already exists)
Manual merge (mostly a null merge), mysql-next-mr-alik (revno 2884) --> mysql-6.0-codebase-alik
modified:
sql/authors.h
sql/sql_repl.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf 2009-09-25 14:15:30 +0000
+++ b/.bzr-mysql/default.conf 2009-09-25 14:29:56 +0000
@@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@stripped"
post_push_to = "commits@stripped"
-tree_name = "mysql-6.0"
+tree_name = "mysql-6.0-alik"
=== modified file '.bzrignore'
--- a/.bzrignore 2009-09-21 18:33:08 +0000
+++ b/.bzrignore 2009-09-25 14:29:56 +0000
@@ -2023,3 +2023,4 @@ libmysqld/examples/mysqltest.cc
libmysqld/bml.cc
mysql-test/mysql-test-lcov
libmysqld/examples/mysqltest.cc
+libmysqld/sql_signal.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2009-09-23 19:43:59 +0000
+++ b/mysql-test/collections/default.experimental 2009-09-25 14:36:45 +0000
@@ -2,25 +2,85 @@
# in alphabetical order. This also helps with merge conflict resolution.
backup.backup_datatypes @darwin # Bug#46934 2009-08-26 alik backup_datatypes fails on Mac OS X
-backup.backup_dbname_lctn2 @windows # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
+backup.backup_dbname_lctn2 @windows @darwin # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
+backup.backup_events # Bug#47211 2009-09-25 alik backup_events.test fails randomly
backup.backup_external_non_win* # BUG#45877
+backup.backup_objects_dependency # Bug#43549 2009-09-25 alik The backup_objects_dependency test is non-deterministic
backup.backup_xpfm_compat_backup_lctn2 @windows # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
+
binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
+
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#44030 2009-09-24 alik Marking innodb-autoinc experimental while waiting for the patch to be merged
+main.merge # Bug#47648 2009-09-25 alik main.merge fails sporadically
main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
-main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled
-main.plugin_load @solaris # Bug#47146
+main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled
+main.plugin_load # Bug#47146
main.truncate_coverage # Bug#46785 2009-08-18 alik main.truncate_coverage fails sporadically
+
ndb.ndb_restore # Bug#37778 2009-07-30 alik ndb.ndb_restore fails randomly
ndb.ndb_restore_print # Bug#37778 2009-07-30 alik ndb.ndb_restore fails randomly
-rpl.rpl_backup_multi* # BUG#45284
+
rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
rpl.rpl_innodb_bug28430* @solaris # Bug#46029
+rpl.rpl_innodb_bug30888* @solaris # Bug#47646 2009-09-25 alik rpl.rpl_innodb_bug30888 fails sporadically on Solaris
rpl.rpl_killed_ddl* # Bug#45520 2009-07-10 alik rpl_killed_ddl fails sporadically in pb2
rpl.rpl_plugin_load* @solaris # Bug#47146
-rpl.rpl_row_create_table* # Bug#45576 2009-07-10 alik rpl_row_create_table fails on PB2
+rpl.rpl_backup_multi* # BUG#45284
+rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2
rpl.rpl_semi_sync fails # Bug#47566 2009-09-23 alik rpl.rpl_semi_sync fails sporadically
+rpl.rpl_trigger* # Bug#46656 2009-09-25 alik InnoDB plugin: memory leaks (Valgrind)
+
rpl_ndb.rpl_ndb_log # Bug#38998
+
+# 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
=== added file 'mysql-test/collections/mysql-next-mr.push'
--- a/mysql-test/collections/mysql-next-mr.push 1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-next-mr.push 2009-09-24 12:40:09 +0000
@@ -0,0 +1,5 @@
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --embedded --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --suite=funcs_1
=== added file 'mysql-test/collections/mysql-trunk.push'
--- a/mysql-test/collections/mysql-trunk.push 1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/mysql-trunk.push 2009-09-24 12:30:13 +0000
@@ -0,0 +1,5 @@
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --embedded --suite=main,binlog,innodb,federated,rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --suite=funcs_1
=== modified file 'mysql-test/t/mdl_sync.test'
--- a/mysql-test/t/mdl_sync.test 2009-09-01 15:57:05 +0000
+++ b/mysql-test/t/mdl_sync.test 2009-09-25 14:36:45 +0000
@@ -1,3 +1,6 @@
+# -- [DISABLED Bug#47304]
+--source include/not_embedded.inc
+
#
# We need the Debug Sync Facility.
#
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2009-09-25 14:15:30 +0000
+++ b/sql/sql_select.cc 2009-09-25 14:49:52 +0000
@@ -2939,7 +2939,7 @@ JOIN::destroy()
tab->cleanup();
}
tmp_join->tmp_join= 0;
- tmp_table_param.cleanup();
+ tmp_table_param.copy_field= 0;
DBUG_RETURN(tmp_join->destroy());
}
cond_equal= 0;
Attachment: [text/bzr-bundle] bzr/alik@sun.com-20090925144952-s1p9ib6f35rkdmvg.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-alik branch (alik:3615 to 3618) Bug#45989 | Alexander Nozdrin | 25 Sep |
