| List: | Commits | « Previous MessageNext Message » | |
| From: | kent | Date: | April 4 2006 11:38pm |
| Subject: | bk commit into 5.1 tree (kent:1.2283) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 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.2283 06/04/04 23:37:44 kent@stripped +12 -0 Merge support-files/mysql.spec.sh 1.135 06/04/04 23:37:30 kent@stripped +2 -1 sql/item.cc 1.180 06/04/04 23:24:01 kent@stripped +0 -0 Auto merged mysql-test/Makefile.am 1.70 06/04/04 23:23:59 kent@stripped +0 -0 Auto merged libmysql_r/Makefile.am 1.25 06/04/04 23:23:59 kent@stripped +0 -1 Auto merged libmysql/Makefile.am 1.49 06/04/04 23:23:58 kent@stripped +0 -0 Auto merged config/ac-macros/yassl.m4 1.13 06/04/04 23:23:58 kent@stripped +0 -0 Auto merged VC++Files/storage/innobase/innobase.vcproj 1.4 06/04/04 23:23:58 kent@stripped +0 -0 Auto merged VC++Files/storage/bdb/bdb.vcproj 1.6 06/04/04 23:23:58 kent@stripped +0 -0 Auto merged VC++Files/sql/mysqld.vcproj 1.12 06/04/04 23:23:57 kent@stripped +0 -0 Auto merged VC++Files/mysys/mysys.vcproj 1.5 06/04/04 23:23:56 kent@stripped +0 -0 Auto merged VC++Files/mysqldemb/mysqldemb.vcproj 1.5 06/04/04 23:23:56 kent@stripped +0 -0 Auto merged VC++Files/libmysqld/libmysqld.vcproj 1.8 06/04/04 23:23:55 kent@stripped +0 -0 Auto merged VC++Files/storage/innobase/innobase.vcproj 1.1.1.2 06/04/04 23:23:54 kent@stripped +0 -0 Merge rename: VC++Files/innobase/innobase.vcproj -> VC++Files/storage/innobase/innobase.vcproj VC++Files/storage/bdb/bdb.vcproj 1.1.1.2 06/04/04 23:23:53 kent@stripped +0 -0 Merge rename: VC++Files/bdb/bdb.vcproj -> VC++Files/storage/bdb/bdb.vcproj # 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.1-new/RESYNC --- 1.48/libmysql/Makefile.am 2006-03-24 22:50:45 +01:00 +++ 1.49/libmysql/Makefile.am 2006-04-04 23:23:58 +02:00 @@ -29,7 +29,11 @@ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) -libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) +libmysqlclient_la_LIBADD = $(target_libadd) +if HAVE_YASSL +libmysqlclient_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif libmysqlclient_la_LDFLAGS = $(target_ldflags) EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c cmakelists.txt noinst_HEADERS = client_settings.h --- 1.179/sql/item.cc 2006-04-04 13:14:56 +02:00 +++ 1.180/sql/item.cc 2006-04-04 23:24:01 +02:00 @@ -532,8 +532,9 @@ RETURN TRUE if 'this' references the field 'arg' - FALE otherwise + FALSE otherwise */ + bool Item_field::find_item_in_field_list_processor(byte *arg) { KEY_PART_INFO *first_non_group_part= *((KEY_PART_INFO **) arg); --- 1.134/support-files/mysql.spec.sh 2006-03-07 20:00:44 +01:00 +++ 1.135/support-files/mysql.spec.sh 2006-04-04 23:37:30 +02:00 @@ -1,3 +1,4 @@ + %define mysql_version @VERSION@ # use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x) @@ -217,6 +218,7 @@ CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \ CFLAGS=\"$CFLAGS\" \ CXXFLAGS=\"$CXXFLAGS\" \ + LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \ ./configure \ $* \ --with-mysqld-ldflags='-static' \ @@ -709,6 +711,10 @@ # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Sat Apr 01 2006 Kent Boortz <kent@stripped> + +- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS + * Wed Mar 07 2006 Kent Boortz <kent@stripped> - Changed product name from "Community Edition" to "Community Server" --- 1.1.1.1/VC++Files/bdb/bdb.vcproj 2006-04-01 02:12:18 +02:00 +++ 1.6/VC++Files/storage/bdb/bdb.vcproj 2006-04-04 23:23:58 +02:00 @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="bdb" + ProjectGUID="{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}" SccProjectName="" SccLocalPath=""> <Platforms> @@ -22,7 +23,7 @@ Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" - AdditionalIncludeDirectories="../bdb/build_win32,../bdb" + AdditionalIncludeDirectories="../bdb/build_win32,../bdb,../bdb/dbinc" PreprocessorDefinitions="NDEBUG;DBUG_OFF;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="0" @@ -119,6 +120,28 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File + RelativePath="crypto\aes_method.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath=".\btree\bt_compact.c"> + </File> + <File RelativePath="btree\bt_compare.c"> <FileConfiguration Name="Max|Win32"> @@ -499,6 +522,25 @@ </FileConfiguration> </File> <File + RelativePath="crypto\crypto.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="db\db.c"> <FileConfiguration Name="Max|Win32"> @@ -594,6 +636,9 @@ </FileConfiguration> </File> <File + RelativePath=".\common\db_clock.c"> + </File> + <File RelativePath="db\db_conv.c"> <FileConfiguration Name="Max|Win32"> @@ -841,6 +886,25 @@ </FileConfiguration> </File> <File + RelativePath="db\db_ovfl_vrfy.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="db\db_pr.c"> <FileConfiguration Name="Max|Win32"> @@ -974,6 +1038,44 @@ </FileConfiguration> </File> <File + RelativePath="db\db_setid.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath="db\db_setlsn.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="env\db_shash.c"> <FileConfiguration Name="Max|Win32"> @@ -993,6 +1095,25 @@ </FileConfiguration> </File> <File + RelativePath="db\db_stati.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="db\db_truncate.c"> <FileConfiguration Name="Max|Win32"> @@ -1164,6 +1285,25 @@ </FileConfiguration> </File> <File + RelativePath="dbreg\dbreg_stat.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="dbreg\dbreg_util.c"> <FileConfiguration Name="Max|Win32"> @@ -1183,6 +1323,9 @@ </FileConfiguration> </File> <File + RelativePath=".\env\env_failchk.c"> + </File> + <File RelativePath="env\env_file.c"> <FileConfiguration Name="Max|Win32"> @@ -1278,6 +1421,28 @@ </FileConfiguration> </File> <File + RelativePath=".\env\env_register.c"> + </File> + <File + RelativePath="env\env_stat.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="fileops\fileops_auto.c"> <FileConfiguration Name="Max|Win32"> @@ -1696,6 +1861,47 @@ </FileConfiguration> </File> <File + RelativePath=".\lock\lock_failchk.c"> + </File> + <File + RelativePath="lock\lock_id.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath="lock\lock_list.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="lock\lock_method.c"> <FileConfiguration Name="Max|Win32"> @@ -1753,6 +1959,25 @@ </FileConfiguration> </File> <File + RelativePath="lock\lock_timer.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="lock\lock_util.c"> <FileConfiguration Name="Max|Win32"> @@ -1829,6 +2054,9 @@ </FileConfiguration> </File> <File + RelativePath=".\log\log_debug.c"> + </File> + <File RelativePath="log\log_get.c"> <FileConfiguration Name="Max|Win32"> @@ -1886,6 +2114,25 @@ </FileConfiguration> </File> <File + RelativePath="log\log_stat.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="mp\mp_alloc.c"> <FileConfiguration Name="Max|Win32"> @@ -1943,6 +2190,25 @@ </FileConfiguration> </File> <File + RelativePath="mp\mp_fmethod.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="mp\mp_fopen.c"> <FileConfiguration Name="Max|Win32"> @@ -2114,7 +2380,7 @@ </FileConfiguration> </File> <File - RelativePath="mutex\mut_tas.c"> + RelativePath="crypto\mersenne\mt19937db.c"> <FileConfiguration Name="Max|Win32"> <Tool @@ -2133,7 +2399,19 @@ </FileConfiguration> </File> <File - RelativePath="mutex\mut_win32.c"> + RelativePath=".\mutex\mut_alloc.c"> + </File> + <File + RelativePath=".\mutex\mut_method.c"> + </File> + <File + RelativePath=".\mutex\mut_region.c"> + </File> + <File + RelativePath=".\mutex\mut_stat.c"> + </File> + <File + RelativePath="mutex\mut_tas.c"> <FileConfiguration Name="Max|Win32"> <Tool @@ -2152,7 +2430,7 @@ </FileConfiguration> </File> <File - RelativePath="mutex\mutex.c"> + RelativePath="mutex\mut_win32.c"> <FileConfiguration Name="Max|Win32"> <Tool @@ -2304,6 +2582,9 @@ </FileConfiguration> </File> <File + RelativePath=".\os_win32\os_flock.c"> + </File> + <File RelativePath="os_win32\os_fsync.c"> <FileConfiguration Name="Max|Win32"> @@ -2627,7 +2908,7 @@ </FileConfiguration> </File> <File - RelativePath="os_win32\os_type.c"> + RelativePath="os_win32\os_truncate.c"> <FileConfiguration Name="Max|Win32"> <Tool @@ -2855,6 +3136,50 @@ </FileConfiguration> </File> <File + RelativePath="rep\rep_auto.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath="rep\rep_backup.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath=".\rep\rep_elect.c"> + </File> + <File + RelativePath=".\rep\rep_log.c"> + </File> + <File RelativePath="rep\rep_method.c"> <FileConfiguration Name="Max|Win32"> @@ -2912,6 +3237,28 @@ </FileConfiguration> </File> <File + RelativePath="rep\rep_stat.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath=".\rep\rep_stub.c"> + </File> + <File RelativePath="rep\rep_util.c"> <FileConfiguration Name="Max|Win32"> @@ -2931,6 +3278,47 @@ </FileConfiguration> </File> <File + RelativePath=".\rep\rep_verify.c"> + </File> + <File + RelativePath="crypto\rijndael\rijndael-alg-fst.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File + RelativePath="crypto\rijndael\rijndael-api-fst.c"> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="hmac\sha1.c"> <FileConfiguration Name="Max|Win32"> @@ -3005,6 +3393,12 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions=""/> </FileConfiguration> + </File> + <File + RelativePath=".\txn\txn_chkpt.c"> + </File> + <File + RelativePath=".\txn\txn_failchk.c"> </File> <File RelativePath="txn\txn_method.c"> --- 1.1.1.1/VC++Files/innobase/innobase.vcproj 2006-04-01 02:12:18 +02:00 +++ 1.4/VC++Files/storage/innobase/innobase.vcproj 2006-04-04 23:23:58 +02:00 @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="innobase" + ProjectGUID="{8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B}" SccProjectName="" SccLocalPath=""> <Platforms> @@ -23,7 +24,7 @@ Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" - AdditionalIncludeDirectories="../innobase/include,../include" + AdditionalIncludeDirectories="include,../../include" PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER" StringPooling="TRUE" RuntimeLibrary="0" @@ -74,7 +75,7 @@ Name="VCCLCompilerTool" Optimization="0" OptimizeForProcessor="2" - AdditionalIncludeDirectories="../innobase/include,../include" + AdditionalIncludeDirectories="include,../../include" PreprocessorDefinitions="NDEBUG;_LIB;_WIN32;WIN32;MYSQL_SERVER" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug/innobase.pch" @@ -125,7 +126,7 @@ Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" - AdditionalIncludeDirectories="../innobase/include,../include" + AdditionalIncludeDirectories="include,../../include" PreprocessorDefinitions="_LIB;_WIN32;WIN32;MYSQL_SERVER;NDEBUG" StringPooling="TRUE" RuntimeLibrary="0" @@ -177,7 +178,7 @@ Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" - AdditionalIncludeDirectories="../innobase/include,../include" + AdditionalIncludeDirectories="include,../../include" PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER" StringPooling="TRUE" RuntimeLibrary="0" --- 1.7/VC++Files/libmysqld/libmysqld.vcproj 2006-02-22 20:05:45 +01:00 +++ 1.8/VC++Files/libmysqld/libmysqld.vcproj 2006-04-04 23:23:55 +02:00 @@ -86,7 +86,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" --- 1.4/VC++Files/mysqldemb/mysqldemb.vcproj 2006-01-13 22:09:38 +01:00 +++ 1.5/VC++Files/mysqldemb/mysqldemb.vcproj 2006-04-04 23:23:56 +02:00 @@ -71,7 +71,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" --- 1.4/VC++Files/mysys/mysys.vcproj 2006-02-28 12:50:34 +01:00 +++ 1.5/VC++Files/mysys/mysys.vcproj 2006-04-04 23:23:56 +02:00 @@ -67,7 +67,6 @@ ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" --- 1.11/VC++Files/sql/mysqld.vcproj 2006-02-28 13:21:16 +01:00 +++ 1.12/VC++Files/sql/mysqld.vcproj 2006-04-04 23:23:57 +02:00 @@ -20,7 +20,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -82,7 +81,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -143,7 +141,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -207,7 +204,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -271,7 +267,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -393,7 +388,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -455,7 +449,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" --- 1.69/mysql-test/Makefile.am 2006-01-01 22:57:43 +01:00 +++ 1.70/mysql-test/Makefile.am 2006-04-04 23:23:59 +02:00 @@ -22,12 +22,14 @@ benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp +EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) -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 --- 1.12/config/ac-macros/yassl.m4 2006-01-10 08:01:39 +01:00 +++ 1.13/config/ac-macros/yassl.m4 2006-04-04 23:23:58 +02:00 @@ -17,7 +17,6 @@ yassl_dir="extra/yassl" yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" yassl_includes="-I\$(top_srcdir)/extra/yassl/include" - yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) # System specific checks @@ -38,7 +37,6 @@ AC_MSG_RESULT(no) fi AC_SUBST(yassl_libs) - AC_SUBST(yassl_libs_with_path) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) --- 1.24/libmysql_r/Makefile.am 2006-01-10 08:01:40 +01:00 +++ 1.25/libmysql_r/Makefile.am 2006-04-04 23:23:59 +02:00 @@ -32,7 +32,11 @@ libmysql_dir = $(top_srcdir)/libmysql libmysqlclient_r_la_SOURCES = $(target_sources) -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) +libmysqlclient_r_la_LIBADD = $(target_libadd) +if HAVE_YASSL +libmysqlclient_r_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif libmysqlclient_r_la_LDFLAGS = $(target_ldflags) # This is called from the toplevel makefile
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (kent:1.2283) | kent | 4 Apr |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.665 sec. using MySQL 5.1.14-beta-log