diff options
| author | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
|---|---|---|
| committer | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
| commit | 39cbb547d433f7fdcfbe5655f14ffb8c93fe6122 (patch) | |
| tree | 390fab0240f652c5c3ddbf153549ac34cb5c1b2b /mysql-test/std_data | |
| parent | 9ad75823e7406c3afec09e642615e4821d25df5a (diff) | |
| parent | 666d46b6ee19c0399fadff220952a9ac9a097f85 (diff) | |
| download | mariadb-git-39cbb547d433f7fdcfbe5655f14ffb8c93fe6122.tar.gz | |
Resolve merge colflict
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/rpl_loaddata2.dat | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/std_data/rpl_loaddata2.dat b/mysql-test/std_data/rpl_loaddata2.dat index 7a3d4ea7695..b883d9dcd58 100644 --- a/mysql-test/std_data/rpl_loaddata2.dat +++ b/mysql-test/std_data/rpl_loaddata2.dat @@ -1,8 +1,8 @@ -2003-01-21,6328,%a%,%aaaaa% +>2003-01-21,6328,%a%,%aaaaa% ## -2003-02-22,2461,b,%a a a @@ @% @b ' " a% +>2003-02-22,2461,b,%a a a @@ @% @b ' " a% ## -2003-03-22,2161,%c%,%asdf% +>2003-03-22,2161,%c%,%asdf% ## -2003-04-22,2416,%a%,%bbbbb% +>2003-04-22,2416,%a%,%bbbbb% ## |