database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-18 23:03:28 +03:00
Code Activity

Resolve merge colflict

Browse Source
This commit is contained in:
venu@myvenu.com
2003-05-21 00:12:09 -07:00
parent 9ad75823e7 666d46b6ee
commit 39cbb547d4
132 changed files with 1238 additions and 39342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/make_win_src_distribution.sh
View File

@ -258,6 +258,12 @@ do
then
$CP $i $BASE/$i
fi
done
#
# Fix some windows files
#
./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp
#