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@stripped, 2007-01-01 05:37:55+01:00, kent@kent-amd64.(none) +3 -0
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
MERGE: 1.1810.2362.34
BUILD/check-cpu@stripped, 2007-01-01 05:37:52+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.13.1.3
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822@stripped, 2007-01-01 05:37:52+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.2.3.2
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822@stripped, 2007-01-01 05:37:52+01:00, kent@kent-amd64.(none) +0 -0
Merge rename: VC++Files/mysys/mysys.vcproj -> BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822
client/mysql_upgrade.c@stripped, 2007-01-01 05:37:52+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.6.1.10
# 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: kent-amd64.(none)
# Root: /home/kent/bk/tmp/mysql-5.1-build/RESYNC
--- 1.2.3.1/VC++Files/mysys/mysys.vcproj 2007-01-01 05:38:00 +01:00
+++ 1.11/BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822 2007-01-01 05:38:00 +01:00
@@ -405,6 +405,50 @@
</FileConfiguration>
</File>
<File
+ RelativePath="base64.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Max|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="TLS_DEBUG|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="TLS|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="charset-def.c">
<FileConfiguration
Name="Debug|Win32">
@@ -4453,10 +4497,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="mysys_priv.h">
- </File>
- <File
- RelativePath="ptr_cmp.c">
+ RelativePath="my_vle.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
@@ -4499,7 +4540,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="queues.c">
+ RelativePath="mysys_priv.h">
+ </File>
+ <File
+ RelativePath="ptr_cmp.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
@@ -4542,7 +4586,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="raid.cpp">
+ RelativePath="queues.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
--- 1.18/BUILD/check-cpu 2007-01-01 05:38:00 +01:00
+++ 1.19/BUILD/check-cpu 2007-01-01 05:38:00 +01:00
@@ -177,8 +177,7 @@
touch __test.c
while [ "$cpu_arg" ] ; do
- # FIXME: echo -n isn't portable - see contortions autoconf goes through
- echo -n testing $cpu_arg "... " >&2
+ printf "testing $cpu_arg ... " >&2
# compile check
check_cpu_cflags=`eval echo $check_cpu_args`
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2374) | kent | 1 Jan |
