diff options
| author | unknown <venu@myvenu.com> | 2003-05-21 00:12:09 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-05-21 00:12:09 -0700 |
| commit | a8e5dcb449cf6af8eb76b7cc8ad65e19663d8107 (patch) | |
| tree | 390fab0240f652c5c3ddbf153549ac34cb5c1b2b /mysql-test/std_data | |
| parent | 61fd4d561d3c421930823250c8e9039ff7c281e9 (diff) | |
| parent | c121cb748d9432561664ad020c3c48431fe2a48c (diff) | |
| download | mariadb-git-a8e5dcb449cf6af8eb76b7cc8ad65e19663d8107.tar.gz | |
Resolve merge colflict
mysql-test/r/create.result:
Auto merged
mysql-test/r/isam.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
include/mysqld_error.h:
Resolve merge colflict by changing the warning codes
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% ## |