diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-07 20:14:06 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-07 20:14:06 +0500 |
| commit | a0336ad7d8f28b8de5a2b01ec285634952692abb (patch) | |
| tree | a95fb8d593c69b8db4fa05ae09a5b11c223c117c /mysql-test/r/loaddata.result | |
| parent | bc52d1d6e306e5fa915d5ebd4db673f2ca552329 (diff) | |
| parent | 8195a213c2fadfb185e755ce6dda2162df1a5529 (diff) | |
| download | mariadb-git-a0336ad7d8f28b8de5a2b01ec285634952692abb.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/gis.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
sql/item.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/loaddata.result:
Merge with 5.0-opt.
mysql-test/t/view.test:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 67665427f9f..98e221b0dea 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -247,6 +247,20 @@ f1 1 2 drop table t1,t2; +CREATE TABLE t1 (c1 INT, c2 TIMESTAMP, c3 REAL, c4 DOUBLE); +INSERT INTO t1 (c1, c2, c3, c4) VALUES (10, '1970-02-01 01:02:03', 1.1E-100, 1.1E+100); +SELECT * FROM t1; +c1 c2 c3 c4 +10 1970-02-01 01:02:03 1.1e-100 1.1e+100 +SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY '-' FROM t1; +-10- -1970\-02\-01 01:02:03- -1.1e\-100- -1.1e+100- +EOF +TRUNCATE t1; +LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t1 FIELDS ENCLOSED BY '-'; +SELECT * FROM t1; +c1 c2 c3 c4 +10 1970-02-01 01:02:03 1.1e-100 1.1e+100 +DROP TABLE t1; CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (1); SET NAMES latin1; |