elenst@perro:~/bzr/randgen-mariadb-patches$ bzr diff
|
=== modified file 'combinations.pl'
|
--- combinations.pl 2014-12-22 17:22:18 +0000
|
+++ combinations.pl 2015-04-24 15:06:19 +0000
|
@@ -77,7 +77,7 @@
|
my $max_result = 0;
|
my $thread_id = 0;
|
my $epochcreadir;
|
-my $mtrbt = defined $ENV{MTR_BUILD_THREAD}?$ENV{MTR_BUILD_THREAD}:300;
|
+my $mtrbt = defined $ENV{MTR_BUILD_THREAD}?$ENV{MTR_BUILD_THREAD}:73;
|
|
my $opt_result = GetOptions(
|
'config=s' => \$config_file,
|
|
=== modified file 'conf/mariadb/gtid_stress.zz'
|
--- conf/mariadb/gtid_stress.zz 2013-06-23 16:17:39 +0000
|
+++ conf/mariadb/gtid_stress.zz 2015-04-24 20:40:40 +0000
|
@@ -21,7 +21,8 @@
|
|
$tables = {
|
partitions => [ undef , 'HASH(pk) PARTITIONS 2' ],
|
- engines => [ 'InnoDB' ]
|
+ engines => [ 'InnoDB' ],
|
+ rows => [ 0, 1, 10, 100, 1000, 2000 ]
|
};
|
|
$fields = {
|
|
=== modified file 'lib/GenTest/Constants.pm'
|
--- lib/GenTest/Constants.pm 2013-06-21 23:07:00 +0000
|
+++ lib/GenTest/Constants.pm 2015-04-24 15:07:30 +0000
|
@@ -147,7 +147,7 @@
|
use constant DB_JAVADB => 4;
|
use constant DB_DRIZZLE => 5;
|
|
-use constant DEFAULT_MTR_BUILD_THREAD => 930; ## Legacy...
|
+use constant DEFAULT_MTR_BUILD_THREAD => 72; ## Legacy...
|
|
#
|
# The part below deals with constant value to constant name conversions
|
|
=== modified file 'lib/GenTest/Executor/MySQL.pm'
|
--- lib/GenTest/Executor/MySQL.pm 2015-03-22 18:05:51 +0000
|
+++ lib/GenTest/Executor/MySQL.pm 2015-04-23 16:28:17 +0000
|
@@ -1002,7 +1002,7 @@
|
"ELSE data_type END ".
|
"FROM information_schema.tables INNER JOIN ".
|
"information_schema.columns USING(table_schema, table_name) ".
|
- "WHERE table_name <> 'DUMMY'";
|
+ "WHERE table_name <> 'DUMMY' AND table_name <> 'GEOMETRY_COLUMNS'";
|
|
return $self->dbh()->selectall_arrayref($query);
|
}
|
|
=== modified file 'lib/GenTest/Reporter/ReplicationThreadRestarter.pm'
|
--- lib/GenTest/Reporter/ReplicationThreadRestarter.pm 2010-02-10 12:47:45 +0000
|
+++ lib/GenTest/Reporter/ReplicationThreadRestarter.pm 2015-04-30 23:09:29 +0000
|
@@ -61,8 +61,30 @@
|
}
|
}
|
|
+sub report {
|
+
|
+ my $reporter = shift;
|
+ my $slave_host = $reporter->serverInfo('slave_host');
|
+ my $slave_port = $reporter->serverInfo('slave_port');
|
+
|
+ my $slave_dsn = 'dbi:mysql:host='.$slave_host.':port='.$slave_port.':user=root';
|
+ my $slave_dbh = DBI->connect($slave_dsn);
|
+
|
+ if (defined $slave_dbh) {
|
+ $slave_dbh->do("START SLAVE");
|
+ if ($slave_dbh->err()) {
|
+ say("Query START SLAVE failed: ".$slave_dbh->errstr());
|
+ return STATUS_REPLICATION_FAILURE;
|
+ } else {
|
+ return STATUS_OK;
|
+ }
|
+ } else {
|
+ return STATUS_SERVER_CRASHED;
|
+ }
|
+}
|
+
|
sub type {
|
- return REPORTER_TYPE_PERIODIC;
|
+ return REPORTER_TYPE_PERIODIC | REPORTER_TYPE_SUCCESS;
|
}
|
|
1;
|
binlogs.tar.gz
threads1