diff options
author | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
commit | 07302c60078b21b90d00b80677beced5de521f10 (patch) | |
tree | d7f97f7f906b9107f2569658a74eb1ae2f1eea72 /Docs | |
parent | af66d20c8eed478ea0a81ba38fea07152823a9d0 (diff) | |
parent | b5ca723613666bc6472de8d02e50fee7ea7785ef (diff) | |
download | mariadb-git-07302c60078b21b90d00b80677beced5de521f10.tar.gz |
Merge
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
VC++Files/storage/bdb/bdb.vcproj:
Auto merged
VC++Files/storage/innobase/innobase.vcproj:
Auto merged
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'Docs')
-rw-r--r-- | Docs/MySQLEULA.txt | 2 |
1 files changed, 1 insertions, 1 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 |