3399 Andrei Elkin 2011-08-22
wl#5599 MTS recovery
updating the result file for rpl_row_mts_rec_crash_safe that got slipped in the last push;
making Bug 12902514 referrenced to a slow "experimental" rpl_mixed_mts_rec_crash_safe.
modified:
mysql-test/collections/default.experimental
mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
3398 Jon Olav Hauglid 2011-08-22
Cherrypick from mysql-5.5-security of:
------------------------------------------------------------
revno: 3222
committer: Georgi Kodinov <Georgi.Kodinov@stripped>
branch nick: B11765565-5.5-security
timestamp: Fri 2011-08-12 15:14:31 +0300
message:
Bug #11765565: 58548: 5.5.X NEEDS TO LINK TO THE CORESERVICES FRAMEWORK
FOR SOME PLUGINS TO WORK
Some dynamically loadable plugins on the Mac may need functions from the
CoreServices framework. Unfortunately the only place where this can be initialized
is the main executable. Thus to allow plugins to use functions from that framework
the mysqld binary needs to link to the framework.
modified:
sql/CMakeLists.txt
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2011-08-19 16:34:34 +0000
+++ b/mysql-test/collections/default.experimental 2011-08-22 15:04:09 +0000
@@ -42,6 +42,6 @@ sys_vars.have_ndbcluster_basic
sys_vars.ndb_log_updated_only_basic
sys_vars.rpl_init_slave_func # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
-rpl.rpl_mixed_mts_rec_crash_safe @solaris # andrei : 2011-08-19 mts recovery tests are slow (todo: find a way to optimize time)
+rpl.rpl_mixed_mts_rec_crash_safe @solaris # Bug 12902514 2011-08-19 andrei mts recovery tests are slow
rpl.rpl_mixed_mts_rec_crash_safe_checksum @solaris # same as rpl_mixed_mts_rec_crash_safe
rpl.rpl_mixed_mts_crash_safe @solaris # same as rpl_mixed_mts_rec_crash_safe
=== modified file 'mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result 2011-08-22 06:14:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result 2011-08-22 15:04:09 +0000
@@ -309,7 +309,7 @@ slave_master_info CREATE TABLE `slave_ma
`Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)',
`Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Master Information'
SHOW CREATE TABLE mysql.slave_relay_log_info;
Table Create Table
slave_relay_log_info CREATE TABLE `slave_relay_log_info` (
@@ -322,7 +322,7 @@ slave_relay_log_info CREATE TABLE `slave
`Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
SHOW CREATE TABLE mysql.slave_worker_info;
Table Create Table
slave_worker_info CREATE TABLE `slave_worker_info` (
@@ -340,7 +340,7 @@ slave_worker_info CREATE TABLE `slave_wo
`Checkpoint_group_size` int(10) unsigned NOT NULL,
`Checkpoint_group_bitmap` blob NOT NULL,
PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Worker Information'
ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (andrei.elkin:3398 to 3399) WL#5599 | Andrei Elkin | 22 Aug |
