summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-06-26 10:57:00 +0300
committermonty@mysql.com <>2004-06-26 10:57:00 +0300
commit137b8517c4224f46ed0ea3f14d12f874426951c8 (patch)
tree8142c45862919677b233adf5ef37a25dcdba04e9
parent6fa7e370f9c754e9e4dca8818c99fe65e23117cf (diff)
downloadmariadb-git-137b8517c4224f46ed0ea3f14d12f874426951c8.tar.gz
Cleanup for creating windows source distribution
-rw-r--r--.bzrignore1
-rw-r--r--scripts/make_win_src_distribution.sh17
-rw-r--r--scripts/mysql_create_system_tables.sh1
3 files changed, 11 insertions, 8 deletions
diff --git a/.bzrignore b/.bzrignore
index 080b46f1e3d..d1364b0219d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -791,3 +791,4 @@ sql/my_time.c
libmysql/my_time.c
libmysqld/my_time.c
sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 1c00ac751d7..eaaf219afc4 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -161,13 +161,16 @@ vreplace()
done
}
-for d in 4.1.XX-gpl 4.1.XX-pro 4.1.XX-classic
-do
- cd $BASE/InstallShield/$d/String\ Tables/0009-English
- vreplace value.shl
- cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
- vreplace infolist.txt
-done
+if test -d $BASE/InstallShield
+then
+ for d in 4.1.XX-gpl 4.1.XX-pro 4.1.XX-classic
+ do
+ cd $BASE/InstallShield/$d/String\ Tables/0009-English
+ vreplace value.shl
+ cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
+ vreplace infolist.txt
+ done
+fi
#
# Move all error message files to root directory
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index 988dcec90f8..e45c0ec5571 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -160,7 +160,6 @@ then
INSERT INTO user (host,user) values ('localhost','');"
else
i_u="$i_u
- INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
INSERT INTO user VALUES ('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
INSERT INTO user VALUES ('%','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0);"