diff options
author | unknown <monty@narttu.mysql.fi> | 2003-03-21 18:53:55 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-03-21 18:53:55 +0200 |
commit | e4ae47ff36894c6c776a26b16141cec5eddb34b0 (patch) | |
tree | ce48d336533b0ff442f6fd114d61fffcfbdc1941 /scripts/make_binary_distribution.sh | |
parent | 75ad5e96e1d7b504e7a0372fd8632c047ac2336f (diff) | |
download | mariadb-git-e4ae47ff36894c6c776a26b16141cec5eddb34b0.tar.gz |
Fixes for fill_help_tables.sql
innobase/ha/ha0ha.c:
Removed compiler warnings
mysql-test/t/innodb.test:
Another fix for cardinality
scripts/Makefile.am:
Install fill_help_tables.sql in prefix/share/mysql
Don't install make_binary_distribution
scripts/fill_help_tables.sh:
use INSERT IGNORE to avoid errors
scripts/make_binary_distribution.sh:
Install and use fill_help_tables.sql
scripts/mysql_install_db.sh:
Search for and use fill_help_tables.sql
sql/mysqld.cc:
Don't write shutdown message when called from mysql_install_db
support-files/Makefile.am:
Don't install binary-configure
support-files/binary-configure.sh:
Don't use config files
Diffstat (limited to 'scripts/make_binary_distribution.sh')
-rw-r--r-- | scripts/make_binary_distribution.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 2fff531c4c8..5ed76cefdb4 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -160,6 +160,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then fi $CP support-files/* $BASE/support-files +$CP scripts/fill_help_tables.sql $BASE/support-files if [ $BASE_SYSTEM = "netware" ] ; then rm -f $BASE/support-files/magic \ @@ -183,14 +184,14 @@ do done $CP mysql-test/include/*.inc $BASE/mysql-test/include -$CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data +$CP mysql-test/std_data/*.dat mysql-test/std_data/*.*001 $BASE/mysql-test/std_data $CP mysql-test/std_data/des_key_file $BASE/mysql-test/std_data $CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t $CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r if [ $BASE_SYSTEM != "netware" ] ; then $CP scripts/* $BASE/bin - $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db + $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ \@pkgdatadir\@ ./support-files < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe mv $BASE/support-files/binary-configure $BASE/configure |