summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-08 12:25:37 +0200
committerunknown <monty@mysql.com>2003-12-08 12:25:37 +0200
commite505696ffc54eeb819c5a59abeb3866155641ed8 (patch)
tree2e2c3dbf3b3ed7009ec1572281cd1711c0875a30 /scripts
parent580d754da662f7f9e0abf47f9e738ff737eecf6c (diff)
downloadmariadb-git-e505696ffc54eeb819c5a59abeb3866155641ed8.tar.gz
Portability fixes for Windows
VC++Files/client/mysqlclient.dsp: Update for windows VC++Files/libmysql/libmysql.dsp: Update for windows VC++Files/strings/strings.dsp: Update for windows libmysqld/lib_sql.cc: Update for windows scripts/make_win_src_distribution.sh: Update for windows scripts/mysql_install_db.sh: Update for windows sql/mysqld.cc: Remove not used variable sql/set_var.cc: Indentation cleanups sql/share/czech/errmsg.txt: Fixed wrong delimiters sql/share/danish/errmsg.txt: Fixed wrong delimiters sql/share/dutch/errmsg.txt: Fixed wrong delimiters sql/share/english/errmsg.txt: Fixed wrong delimiters sql/share/estonian/errmsg.txt: Fixed wrong delimiters sql/share/french/errmsg.txt: Fixed wrong delimiters sql/share/greek/errmsg.txt: Fixed wrong delimiters sql/share/hungarian/errmsg.txt: Fixed wrong delimiters sql/share/italian/errmsg.txt: Fixed wrong delimiters sql/share/japanese/errmsg.txt: Fixed wrong delimiters sql/share/korean/errmsg.txt: Fixed wrong delimiters sql/share/norwegian-ny/errmsg.txt: Fixed wrong delimiters sql/share/norwegian/errmsg.txt: Fixed wrong delimiters sql/share/polish/errmsg.txt: Fixed wrong delimiters sql/share/portuguese/errmsg.txt: Fixed wrong delimiters sql/share/romanian/errmsg.txt: Fixed wrong delimiters sql/share/russian/errmsg.txt: Fixed wrong delimiters sql/share/serbian/errmsg.txt: Fixed wrong delimiters sql/share/slovak/errmsg.txt: Fixed wrong delimiters sql/share/spanish/errmsg.txt: Fixed wrong delimiters sql/share/swedish/errmsg.txt: Fixed wrong delimiters sql/share/ukrainian/errmsg.txt: Fixed wrong delimiters sql/sql_acl.cc: Removed compiler warnings strings/ctype-big5.c: Removed compiler warnings (VC++) strings/ctype-euc_kr.c: Removed compiler warnings (VC++) strings/ctype-gb2312.c: Removed compiler warnings (VC++) strings/ctype-gbk.c: Removed compiler warnings (VC++) strings/ctype-sjis.c: Removed compiler warnings (VC++) strings/ctype-ucs2.c: Removed compiler warnings (VC++) strings/ctype-ujis.c: Removed compiler warnings (VC++)
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/make_win_src_distribution.sh19
-rw-r--r--scripts/mysql_install_db.sh4
2 files changed, 12 insertions, 11 deletions
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index d83548d0061..57612ac8edc 100755
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -178,18 +178,8 @@ rm -r -f "$BASE/share/Makefile"
rm -r -f "$BASE/share/Makefile.in"
rm -r -f "$BASE/share/Makefile.am"
-#
-# Clean up if we did this from a bk tree
-#
-
-if [ -d $BASE/SCCS ]
-then
- find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
-fi
-
mkdir $BASE/Docs $BASE/extra $BASE/include
-
#
# Copy directory files
#
@@ -321,6 +311,15 @@ unix_to_dos $BASE/README
mv $BASE/README $BASE/README.txt
#
+# Clean up if we did this from a bk tree
+#
+
+if [ -d $BASE/SSL/SCCS ]
+then
+ find $BASE -type d -name SCCS | xargs rm -r -f
+fi
+
+#
# Initialize the initial data directory
#
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index acf0f8aa2c8..fcb1f2a4ef1 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -119,11 +119,13 @@ fi
mdata=$ldata/mysql
mysqld=$execdir/mysqld
mysqld_opt=""
+scriptdir=$bindir
if test "$windows" = 1
then
mysqld="./sql/mysqld"
mysqld_opt="--language=./sql/share/english"
+ scriptdir="./scripts"
fi
if test ! -x $mysqld
@@ -199,7 +201,7 @@ then
echo "Installing all prepared tables"
fi
if (
- $bindir/mysql_create_system_tables $create_option $mdata $hostname $windows
+ $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows
if test -n "$fill_help_tables"
then
cat $fill_help_tables