database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191

Browse Source 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0


BitKeeper/etc/logging_ok:
  auto-union
This commit is contained in:
unknown
2005-05-08 23:07:46 +01:00
parent 3e1dad4115 3ac2df4e4c
commit cdfc786f69
6 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/have_outfile.inc Normal file
View File

@@ -0,0 +1,5 @@
-- require r/have_outfile.require
disable_query_log;
select load_file(concat(@tmpdir,"/outfile.test"));
--exec rm $MYSQL_TEST_DIR/var/tmp/outfile.test
enable_query_log;

1
mysql-test/include/test_outfile.inc Normal file
View File

@@ -0,0 +1 @@
eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test";

3
mysql-test/r/have_outfile.require Normal file
View File

@@ -0,0 +1,3 @@
load_file(concat(@tmpdir,"/outfile.test"))
Outfile OK

BIN
mysql-test/r/outfile.result Normal file
View File

Binary file not shown.

60
mysql-test/t/outfile.test
View File

@@ -1,23 +1,47 @@
disable_query_log;
-- source include/test_outfile.inc
eval set @tmpdir="$MYSQL_TEST_DIR/var/tmp";
enable_query_log;
-- source include/have_outfile.inc
# #
# test of into outfile|dumpfile # test of into outfile|dumpfile
# #
# We need to check that we have 'file' privilege. drop table if exists t1;
create table t1 (`a` blob);
insert into t1 values("hello world"),("Hello mars"),(NULL);
disable_query_log;
eval select * into outfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.1" from t1;
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.1"));
disable_query_log;
eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.2" from t1 limit 1;
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.2"));
disable_query_log;
eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.3" from t1 where a is null;
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.3"));
#drop table if exists t1; # the following should give errors
#create table t1 (`a` blob);
#insert into t1 values("hello world"),("Hello mars"),(NULL); disable_query_log;
#select * into outfile "/tmp/select-test.1" from t1; --error 1086
#select load_file("/tmp/select-test.1"); eval select * into outfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.1" from t1;
#select * into dumpfile "/tmp/select-test.2" from t1 limit 1; --error 1086
#select load_file("/tmp/select-test.2"); eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.2" from t1;
#select * into dumpfile "/tmp/select-test.3" from t1 where a is null; --error 1086
#select load_file("/tmp/select-test.3"); eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.3" from t1;
# enable_query_log;
## the following should give errors select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
# --exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.1
#select * into outfile "/tmp/select-test.1" from t1; --exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.2
#select * into dumpfile "/tmp/select-test.1" from t1; --exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.3
#select * into dumpfile "/tmp/select-test.99" from t1; drop table t1;
#select load_file("/tmp/select-test.not-exist");
#drop table t1; # Bug#8191
disable_query_log;
eval select 1 into outfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.4";
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.4"));
--exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.4

7
sql/sql_yacc.yy
View File

@@ -1537,9 +1537,10 @@ select_part2:
select_into: select_into:
limit_clause {} limit_clause {}
| into
| select_from | select_from
| opt_into select_from | into select_from
| select_from opt_into; | select_from into;
select_from: select_from:
FROM join_table_list where_clause group_clause having_clause opt_order_clause limit_clause procedure_clause; FROM join_table_list where_clause group_clause having_clause opt_order_clause limit_clause procedure_clause;
@@ -2507,7 +2508,7 @@ procedure_item:
$2->set_name($1,(uint) ((char*) lex->tok_end - $1)); $2->set_name($1,(uint) ((char*) lex->tok_end - $1));
}; };
opt_into: into:
INTO OUTFILE TEXT_STRING INTO OUTFILE TEXT_STRING
{ {
THD *thd= current_thd; THD *thd= current_thd;