diff options
| author | thek@kpdesk.mysql.com <> | 2006-12-14 13:38:09 +0100 |
|---|---|---|
| committer | thek@kpdesk.mysql.com <> | 2006-12-14 13:38:09 +0100 |
| commit | c9622dfb0a2cf10ede2fc4d647961a92730532c7 (patch) | |
| tree | 632eb652508b6712a2d063da3d72160a3f91d291 /mysql-test | |
| parent | fdbc84d27c9b21f1ab57393a2b4ba57cbd26373c (diff) | |
| parent | 29f72a0ba1b24ce48806753f44ff725896fbec19 (diff) | |
| download | mariadb-git-c9622dfb0a2cf10ede2fc4d647961a92730532c7.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/symlink.result | 21 | ||||
| -rw-r--r-- | mysql-test/t/symlink.test | 37 |
2 files changed, 58 insertions, 0 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 272836c450a..c64d34aa80c 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -111,3 +111,24 @@ t1 CREATE TABLE `t1` ( `i` int(11) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; +show create table t1; +Table Create Table +t1 CREATE TEMPORARY TABLE `t1` ( + `a` int(11) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/' +show create table t1; +Table Create Table +t1 CREATE TEMPORARY TABLE `t1` ( + `a` int(11) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/' +create table t1 (a int) engine=myisam select 42 a; +select * from t1; +a +9 +select * from t1; +a +99 +select * from t1; +a +42 +drop table t1; diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 19a720a4fb8..94890eab93d 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -139,4 +139,41 @@ enable_query_log; show create table t1; drop table t1; +# +# Bug#8706 - temporary table with data directory option fails +# +connect (session1,localhost,root,,); +connect (session2,localhost,root,,); + +connection session1; +disable_query_log; +eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 9 a; +enable_query_log; +# If running test suite with a non standard tmp dir, the "show create table" +# will print "DATA_DIRECTORY=". Use replace_result to mask it out +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR +show create table t1; + +connection session2; +disable_query_log; +eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 99 a; +enable_query_log; +# If running test suite with a non standard tmp dir, the "show create table" +# will print "DATA_DIRECTORY=". Use replace_result to mask it out +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR +show create table t1; + +connection default; +create table t1 (a int) engine=myisam select 42 a; + +connection session1; +select * from t1; +disconnect session1; +connection session2; +select * from t1; +disconnect session2; +connection default; +select * from t1; +drop table t1; + # End of 4.1 tests |