diff options
| author | kent@mysql.com <> | 2006-04-03 03:52:22 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-04-03 03:52:22 +0200 |
| commit | 0298bfaac649ba00d56c3be3e1062f0262367c14 (patch) | |
| tree | 0cbe6eaaac5049e2c7208a28018afdfa218acf81 | |
| parent | 5e28df35af9d758b92c5d9caeedce143dfcf3bd5 (diff) | |
| parent | 6783064d02c6b8d5f1ef8dc592c03bac3aa91e96 (diff) | |
| download | mariadb-git-0298bfaac649ba00d56c3be3e1062f0262367c14.tar.gz | |
Merge
| -rw-r--r-- | Docs/MySQLEULA.txt | 2 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 9 | ||||
| -rw-r--r-- | netware/mysql_install_db.c | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/Docs/MySQLEULA.txt b/Docs/MySQLEULA.txt index 71e630ec81f..f50c50298b1 100644 --- a/Docs/MySQLEULA.txt +++ b/Docs/MySQLEULA.txt @@ -63,7 +63,7 @@ Licensee. 4. Price and payment. No later than thirty (30) days after submission of the Order Form, Licensee shall remit one non-refundable license fee per Licensed Copy as posted on -http://order.mysql.com on the date Licensee submitted the Order Form (the +http://shop.mysql.com on the date Licensee submitted the Order Form (the "License Fee"). All payments shall be made in Euros or U.S. dollars. Licensee shall be responsible for paying all local, state, federal and international sales, value added, excise and other taxes and duties payable in connection diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 5a00efc986b..33598748397 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -32,13 +32,14 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp +EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) -dist_bin_SCRIPTS = mysql-test-run.pl -test_SCRIPTS = mysql-test-run install_test_db +GENSCRIPTS = mysql-test-run install_test_db +PRESCRIPTS = mysql-test-run.pl +test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \ std_data/server-cert.pem std_data/server-key.pem -CLEANFILES = $(test_SCRIPTS) $(test_DATA) +CLEANFILES = $(GENSCRIPTS) $(test_DATA) INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. EXTRA_PROGRAMS = mysql_test_run_new diff --git a/netware/mysql_install_db.c b/netware/mysql_install_db.c index 355e18b819a..65ee7873e5c 100644 --- a/netware/mysql_install_db.c +++ b/netware/mysql_install_db.c @@ -423,7 +423,7 @@ int main(int argc, char **argv) printf("\nThe latest information about MySQL is available on the web at\n"); printf("\thttp://www.mysql.com\n"); - printf("\nSupport MySQL by buying support at https://order.mysql.com\n\n"); + printf("\nSupport MySQL by buying support at http://shop.mysql.com\n\n"); return 0; } diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 33db1eae82a..c05fda745b0 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -1,3 +1,4 @@ + #!/bin/sh # Copyright (C) 2002-2003 MySQL AB # For a more info consult the file COPYRIGHT distributed with this file. @@ -269,7 +270,7 @@ then echo echo "The latest information about MySQL is available on the web at" echo "http://www.mysql.com" - echo "Support MySQL by buying support/licenses at https://order.mysql.com" + echo "Support MySQL by buying support/licenses at http://shop.mysql.com" fi exit 0 else |