Skip to content

Commit

Permalink
fix a couple of dbug tests not to write to /tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
vuvova committed Apr 19, 2016
1 parent cc04a9f commit 1bc0b0b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
3 changes: 1 addition & 2 deletions mysql-test/r/mdev6830.result
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
drop table if exists t1,t2,t3;
drop view if exists v2,v3;
set @@debug_dbug= 'd,opt';
CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=MyISAM;
CREATE TABLE t2 (
f1 DATE,
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/r/select_debug.result
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ insert into t1 values (2,2), (1,1);
create table t2 (a int);
insert into t2 values (2), (3);
set session join_cache_level=3;
set @@debug_dbug= 'd:t:O,/tmp/trace.out';
set @@debug_dbug= 'd,opt';
explain select t1.b from t1,t2 where t1.b=t2.a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
Expand Down
1 change: 0 additions & 1 deletion mysql-test/t/mdev6830-master.opt

This file was deleted.

10 changes: 5 additions & 5 deletions mysql-test/t/mdev6830.test
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

#
# MDEV-6830 Server crashes in best_access_path after a sequence of SELECTs invollving a temptable view
#
--source include/have_debug.inc

--disable_warnings
drop table if exists t1,t2,t3;
drop view if exists v2,v3;
--enable_warnings
set @@debug_dbug= 'd,opt';

CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=MyISAM;

CREATE TABLE t2 (
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/t/select_debug.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ create table t2 (a int);
insert into t2 values (2), (3);

set session join_cache_level=3;
set @@debug_dbug= 'd:t:O,/tmp/trace.out';
set @@debug_dbug= 'd,opt';

explain select t1.b from t1,t2 where t1.b=t2.a;
select t1.b from t1,t2 where t1.b=t2.a;
Expand Down

0 comments on commit 1bc0b0b

Please sign in to comment.