diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
| commit | 6b8e2938f21c508f67ec141256d1ffc77a935851 (patch) | |
| tree | 2559697c56918e4fd2af81f84fcce0ea24dc60d4 /mysql-test/r/rpl_loaddata.result | |
| parent | fb9a939416165321ff4f8b9dae29363671b84de9 (diff) | |
| parent | dba3a0b03181126cfc46048396b96e5cd768fe5a (diff) | |
| download | mariadb-git-6b8e2938f21c508f67ec141256d1ffc77a935851.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
Auto merged
BitKeeper/deleted/.del-mysql.xdc:
Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
Auto merged
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
sql/sql_parse.cc:
Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
Auto merged
Diffstat (limited to 'mysql-test/r/rpl_loaddata.result')
| -rw-r--r-- | mysql-test/r/rpl_loaddata.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index 8735cae47d5..305868b04fd 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -6,8 +6,19 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; create table t1(a int not null auto_increment, b int, primary key(a) ); load data infile '../../std_data/rpl_loaddata.dat' into table t1; +create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60)); +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' ignore 1 lines; +create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60)); +insert into t3 select * from t2; select * from t1; a b 1 10 2 15 +select * from t3; +day id category name +2003-02-22 2461 b a a a @ % ' " a +2003-03-22 2161 c asdf +2003-04-22 2416 a bbbbb drop table t1; +drop table t2; +drop table t3; |