Commit 2176fef4 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
netware/Makefile.am:
  Manual merge
parents 971f15f8 20554a6c

.bzrignore

+2 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,9 @@ ndbcluster-1186/ndb_3.pid 
ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

netware/init_db.sql

netware/libmysql.imp

netware/test_db.sql

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj
@@ -1337,5 +1339,3 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj
 
netware/init_db.sql

netware/test_db.sql

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ check_cpu () { 
    *i386*i486*)

      cpu_arg="pentium-m";

      ;;

    #Core 2 Duo  

    *Intel*Core\(TM\)2*)

      cpu_arg="nocona";

      ;;



    # Intel ia64

    *Itanium*)

EXCEPTIONS-CLIENT

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source 
Software-only Applications Using MySQL Client Libraries (the

"FLOSS Exception").



Version 0.5, 30 August 2006

Version 0.6, 7 March 2007



Exception Intent
@@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0 
Apple Public Source License 2.0

Artistic license From Perl 5.8.0

BSD license "July 22 1999"

Common Development and Distribution License (CDDL) 1.0

Common Public License 1.0

Eclipse Public License 1.0

GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1

Jabber Open Source License 1.0

MIT license ---

MIT license (As listed in file MIT-License.txt) ---

Mozilla Public License (MPL) 1.0/1.1

Open Software License 2.0

OpenSSL license (with original SSLeay license) "2003" ("1998")

Makefile.am

+32 −4
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ tags: 
.PHONY:	init-db bin-dist \

  test    test-force    test-full    test-force-full    test-force-mem \

  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \

  test-ps test-ns

  test-ps test-ns test-ext-funcs test-ext \

  test-fast test-fast-cursor test-fast-view test-fast-prepare \

  test-full-qa



# Target 'test' will run the regression test suite using the built server.

#
@@ -124,11 +126,11 @@ tags: 


test-ps:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol

	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol



test-ns:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(force)

	@PERL@ ./mysql-test-run.pl $(force) $(mem)



test:	test-ns test-ps
@@ -143,7 +145,7 @@ test-force-full: 


#used by autopush.pl to run memory based tests

test-force-mem:

	$(MAKE) 'force=--force --mem' test

	$(MAKE) force=--force mem=--mem test



# Keep these for a while

test-pl:	test
@@ -152,5 +154,31 @@ test-force-pl: test-force 
test-force-pl-mem:  test-force-mem

test-force-full-pl: test-force-full



test-ext-funcs:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \

	@PERL@ ./mysql-test-run.pl --force --suite=funcs_2



test-ext:	test-ext-funcs



test-fast:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \

	@PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam



test-fast-view:

	$(MAKE) subset=--view-protocol test-fast



test-fast-cursor:

	$(MAKE) subset=--cursor-protocol test-fast



test-fast-prepare:

	$(MAKE) subset=--ps-protocol test-fast



test-full-qa:

	$(MAKE) force=--force test-pl \

	test-ext test-fast-view \

	test-fast-cursor



# Don't update the files from bitkeeper

%::SCCS/s.%

VC++Files/bdb/bdb.vcproj

+15 −2623

File changed.

Preview size limit exceeded, changes collapsed.