diff options
| author | bar@mysql.com <> | 2006-01-18 12:55:38 +0400 |
|---|---|---|
| committer | bar@mysql.com <> | 2006-01-18 12:55:38 +0400 |
| commit | 4e4b37a8ef4f69b90cc0e462b9e996f069a187dd (patch) | |
| tree | a82974ad04899e9e56801ed796233b0748686eba /mysql-test/r/loaddata.result | |
| parent | 0e665a7aa56db02ca10d6feef7a7eec6c81e1642 (diff) | |
| download | mariadb-git-4e4b37a8ef4f69b90cc0e462b9e996f069a187dd.tar.gz | |
loaddata.result, loaddata.test:
Adding test case.
sql_yacc.yy:
Adding TEXT_STRING_filesystem, which
converts from character_set_client to
character_set_conversion.
Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
in LOAD DATA and SELECT INTO OUTFILE contexts.
sql_class.h, sql_class.cc:
Adding character_set_filesystem variable,
and charset_is_character_set_filesystem
flag (to avoid conversion when it's not necessary).
set_var.h, set_var.cc:
Adding sys_var_character_set_filesystem
mysqld.cc:
Adding --character-set-filesystem startup option.
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index a52952ffdb5..0246ca5f71d 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -139,3 +139,30 @@ a b c 10 NULL Ten 15 NULL Fifteen drop table t1, t2; +CREATE TABLE t1 (a int); +INSERT INTO t1 VALUES (1); +SET NAMES latin1; +SET character_set_filesystem=filename; +select @@character_set_filesystem; +@@character_set_filesystem +filename +SELECT * INTO OUTFILE 't-1' FROM t1; +DELETE FROM t1; +LOAD DATA INFILE 't-1' INTO TABLE t1; +SELECT * FROM t1; +a +1 +DELETE FROM t1; +SET character_set_filesystem=latin1; +select @@character_set_filesystem; +@@character_set_filesystem +latin1 +LOAD DATA INFILE 't@002d1' INTO TABLE t1; +SELECT * FROM t1; +a +1 +DROP TABLE t1; +SET character_set_filesystem=default; +select @@character_set_filesystem; +@@character_set_filesystem +binary |