diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
| commit | d042146e5b41b6222df3e6b4c16a44f3ef2939b7 (patch) | |
| tree | e40f5b435f7d17ed1c24dfb787ab8cd5f4f7d5d8 /scripts | |
| parent | 3e610bc58d0ba325fdca3b06dfa976ecc513dc1e (diff) | |
| parent | f0f21036951f6fed2fddeb58375425f957751fd5 (diff) | |
| download | mariadb-git-d042146e5b41b6222df3e6b4c16a44f3ef2939b7.tar.gz | |
Merge with MariaDB 5.1.49
Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 8 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index eb2cc94afe9..c89c7cd875e 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -522,9 +522,11 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \ mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \ mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \ $BASE/mysql-test/std_data -$CP mysql-test/t/*.test mysql-test/t/*.imtest \ - mysql-test/t/*.disabled mysql-test/t/*.opt \ - mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t +# Attention: when the wildcards expand to a line that is very long, +# it may exceed the command line length limit on some platform(s). Bug#54590 +$CP mysql-test/t/*.test mysql-test/t/*.imtest $BASE/mysql-test/t +$CP mysql-test/t/*.disabled mysql-test/t/*.opt $BASE/mysql-test/t +$CP mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t $CP mysql-test/r/*.result mysql-test/r/*.require \ $BASE/mysql-test/r diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index ea00b3a183b..8bae2ec9db1 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -479,7 +479,7 @@ then echo "Support MariaDB development by buying support/new features from" echo "Monty Program Ab. You can contact us about this at sales@askmonty.org". echo "Alternatively consider joining our community based development effort:" - echo "http://askmonty.org/wiki/index.php/MariaDB#How_can_I_participate_in_the_development_of_MariaDB.3F" + echo "http://askmonty.org/wiki/index.php/MariaDB#How_can_I_participate_in_the_development_of_MariaDB" echo fi |