database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

After merge fixes

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-03-26 07:22:42 +01:00
parent bc4874b79c
commit 201ce48d5d
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/commit.inc
View File

@ -267,7 +267,7 @@ select * from t2;
insert into t2 (a) values (1026);
--replace_result $MYSQLTEST_VARDIR ..
--error ER_DUP_ENTRY
eval load data infile "../std_data_ln/words.dat" into table t1 (a) set a:=f2(26);
eval load data infile "../../std_data/words.dat" into table t1 (a) set a:=f2(26);
select * from t2;
rollback;
@ -740,6 +740,6 @@ call p_verify_status_increment(0, 0, 0, 0);
--echo #
--echo # Cleanup
--echo #
drop table t1;
drop table t1, t2, t3;
drop procedure p_verify_status_increment;
drop function f1;

7
mysql-test/lib/mtr_report.pm
View File

@ -455,11 +455,14 @@ sub mtr_report_stats ($) {
# that can be copy pasted to rerun only failing tests
print "Failing test(s):";
my %seen= ();
foreach my $tinfo (@$tests)
{
if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' )
my $tname= $tinfo->{'name'};
if ( $tinfo->{'result'} eq 'MTR_RES_FAILED' and ! $seen{$tname})
{
print " $tinfo->{'name'}";
print " $tname";
$seen{$tname}= 1;
}
}
print "\n\n";

2
mysql-test/mysql-test-run.pl
View File

@ -221,8 +221,6 @@ sub main {
gcov_prepare();
}
mtr_report("Collecting tests...");
if (!$opt_suites)
{
$opt_suites= $DEFAULT_SUITES;

4
mysql-test/r/commit_1innodb.result
View File

@ -263,7 +263,7 @@ rollback;
select * from t2;
a
insert into t2 (a) values (1026);
load data infile "../std_data_ln/words.dat" into table t1 (a) set a:=f2(26);
load data infile "../../std_data/words.dat" into table t1 (a) set a:=f2(26);
ERROR 23000: Duplicate entry '26' for key 'a'
select * from t2;
a
@ -879,6 +879,6 @@ SUCCESS
#
# Cleanup
#
drop table t1;
drop table t1, t2, t3;
drop procedure p_verify_status_increment;
drop function f1;

2
mysql-test/suite/binlog/r/binlog_multi_engine.result
View File

@ -37,7 +37,7 @@ mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1b
mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1n
RESET MASTER;
SET SESSION BINLOG_FORMAT=MIXED;
INSERTs INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;

1
mysql-test/suite/binlog/r/binlog_unsafe.result
View File

@ -192,4 +192,3 @@ DROP PROCEDURE proc4;
DROP FUNCTION func5;
DROP PREPARE prep6;
DROP TABLE t1, t2, t3, trigger_table, trigger_table2;
DROP VIEW v1;

1
mysql-test/suite/binlog/t/binlog_unsafe.test
View File

@ -236,4 +236,3 @@ DROP PROCEDURE proc4;
DROP FUNCTION func5;
DROP PREPARE prep6;
DROP TABLE t1, t2, t3, trigger_table, trigger_table2;
DROP VIEW v1;