Commit d2744ebc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


scripts/mysql_install_db.sh:
  Auto merged
parents 6de1d9d3 e2b19a59

Docs/MySQLEULA.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

netware/mysql_install_db.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

scripts/mysql_install_db.sh

+2 −1
Original line number Diff line number Diff line 


#!/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