diff options
| author | msvensson@shellback.(none) <> | 2006-11-29 15:44:09 +0100 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-11-29 15:44:09 +0100 |
| commit | 7ddc43e30596246effffa5944c23d019120f8dda (patch) | |
| tree | 9a20c4415bb69ebb31576302a0e46beb9863997e /mysql-test/lib | |
| parent | ebee55f48a09c3971192beeb122d3fff17794ba6 (diff) | |
| parent | 40684173ad1c4a0a64c8c5bccc0ac9ff1009d8bf (diff) | |
| download | mariadb-git-7ddc43e30596246effffa5944c23d019120f8dda.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/init_db.sql | 3 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/lib/init_db.sql b/mysql-test/lib/init_db.sql index a5736ed4b9b..b7618b3ab46 100644 --- a/mysql-test/lib/init_db.sql +++ b/mysql-test/lib/init_db.sql @@ -634,5 +634,4 @@ CREATE TABLE event ( PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events'; -CREATE DATABASE IF NOT EXISTS cluster; -CREATE TABLE IF NOT EXISTS cluster.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM; +CREATE TABLE IF NOT EXISTS mysql.binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM; diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 758e98984b8..15bee7e39fd 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -43,7 +43,7 @@ sub mtr_show_failed_diff ($) { my $reject_file= "r/$tname.reject"; my $result_file= "r/$tname.result"; - my $log_file= "r/$tname.log"; + my $log_file= "$::opt_vardir/log/$tname.log"; my $eval_file= "r/$tname.eval"; if ( $::opt_suite ne "main" ) @@ -248,6 +248,7 @@ sub mtr_report_stats ($) { foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x", "InnoDB: Warning", "missing DBUG_RETURN", "mysqld: Warning", + "allocated at line", "Attempting backtrace", "Assertion .* failed" ) { foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") ) |