diff options
| author | unknown <ingo@mysql.com> | 2006-02-10 20:00:22 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-02-10 20:00:22 +0100 |
| commit | f6f615b3cc84cd31755e5fcaa7d7fe58f15f2045 (patch) | |
| tree | f2d62fc9a4394024821ed85acc36cce4fd3ee65d /mysql-test/r/rpl_loaddata.result | |
| parent | 3e97cc95d7be5f62174709964bcb1a05f376f53e (diff) | |
| parent | ba0fda4d77b3ba706d539b987d02f3825cfeab86 (diff) | |
| download | mariadb-git-f6f615b3cc84cd31755e5fcaa7d7fe58f15f2045.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.1
into mysql.com:/home/mydev/mysql-5.1-wl1563-msg
mysql-test/r/create_select_tmp.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_varchar.result:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/heap.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
mysql-test/r/rpl_err_ignoredtable.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
mysql-test/r/rpl_insert_id.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
Diffstat (limited to 'mysql-test/r/rpl_loaddata.result')
| -rw-r--r-- | mysql-test/r/rpl_loaddata.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index 03c370d2dd7..47e056429ce 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -61,7 +61,7 @@ unique(day)) engine=MyISAM; load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; -ERROR 23000: Duplicate entry '2003-03-22' for key 1 +ERROR 23000: Duplicate entry '2003-03-22' for key 'day' select * from t2; day id category name 2003-02-22 2461 b a a a @ % ' " a @@ -76,6 +76,6 @@ delete from t2; load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; -ERROR 23000: Duplicate entry '2003-03-22' for key 1 +ERROR 23000: Duplicate entry '2003-03-22' for key 'day' drop table t2; drop table t2; |