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 /scripts/make_win_src_distribution.sh | |
| 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 'scripts/make_win_src_distribution.sh')
| -rwxr-xr-x | scripts/make_win_src_distribution.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index fca13e43e70..a6312193221 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -259,6 +259,12 @@ do done # +# Fix some windows files +# + +./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp + +# # Initialize the initial data directory # |