Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2132 06/04/03 03:52:22 kent@stripped +2 -0
Merge
mysql-test/Makefile.am
1.68 06/04/03 03:52:15 kent@stripped +1 -2
scripts/mysql_install_db.sh
1.64 06/04/03 03:51:09 kent@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: c-534072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.0-new/RESYNC
--- 1.63/scripts/mysql_install_db.sh 2005-05-09 14:13:34 +02:00
+++ 1.64/scripts/mysql_install_db.sh 2006-04-03 03:51:09 +02:00
@@ -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 @@
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
--- 1.67/mysql-test/Makefile.am 2006-04-01 05:51:44 +02:00
+++ 1.68/mysql-test/Makefile.am 2006-04-03 03:52:15 +02:00
@@ -32,13 +32,14 @@
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
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2132) | kent | 3 Apr |
