Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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@stripped, 2007-03-23 10:57:17+01:00, joerg@trift2. +9 -0
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
MERGE: 1.2473.6.35
BUILD/check-cpu@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.21.1.2
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.15.1.1
BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.9.1.1
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.29.1.1
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.20.1.1
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.8.1.1
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -3
Auto merged
MERGE: 1.13.1.1
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85@stripped, 2007-03-23 10:57:05+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.3.1.1
mysql-test/mysql-test-run.pl@stripped, 2007-03-23 10:57:06+01:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.283.2.2
# 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: joerg
# Host: trift2.
# Root: /MySQL/M51/push-5.1/RESYNC
--- 1.30/BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547 2007-03-21 00:58:01 +01:00
+++ 1.31/BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547 2007-03-23 10:57:05 +01:00
@@ -4,7 +4,6 @@
{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
- {8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbug", "dbug\dbug.vcproj", "{FC369DF4-AEB7-4531-BF34-A638C4363BFE}"
--- 1.4/BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85 2007-03-21 00:58:01 +01:00
+++ 1.5/BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85 2007-03-23 10:57:05 +01:00
@@ -73,7 +73,7 @@
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../extra/yassl/include"
- PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"
+ PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug_obj/vio.pch"
AssemblerListingLocation=".\debug_obj/"
--- 1.288/mysql-test/mysql-test-run.pl 2007-03-22 01:04:26 +01:00
+++ 1.289/mysql-test/mysql-test-run.pl 2007-03-23 10:57:06 +01:00
@@ -3663,8 +3663,16 @@
if ( $mysql_version_id >= 50036)
{
- # Prevent the started mysqld to access files outside of vardir
- mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
+ # By default, prevent the started mysqld to access files outside of vardir
+ my $secure_file_dir= $opt_vardir;
+ if ( $opt_suite ne "main" )
+ {
+ # When running a suite other than default allow the mysqld
+ # access to subdirs of mysql-test/ in order to make it possible
+ # to "load data" from the suites data/ directory.
+ $secure_file_dir= $glob_mysql_test_dir;
+ }
+ mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $secure_file_dir);
}
if ( $mysql_version_id >= 50000 )
--- 1.26/BUILD/check-cpu 2007-03-22 16:58:43 +01:00
+++ 1.27/BUILD/check-cpu 2007-03-23 10:57:05 +01:00
@@ -64,10 +64,11 @@
;;
# Intel ia32
- *X[eE][oO][nN]*)
+ *Intel*Core*|*X[eE][oO][nN]*)
# a Xeon is just another pentium4 ...
# ... unless it has the "lm" (long-mode) flag set,
- # in that case it's a Xeon with EM64T support
+ # in that case it's a Xeon with EM64T support
+ # So is Intel Core.
if [ -z "$cpu_flag_lm" ]; then
cpu_arg="pentium4";
else
| Thread |
|---|
| • bk commit into 5.1 tree (joerg:1.2496) | Joerg Bruehe | 23 Mar |
