Below is the list of changes that have just been committed into a local
5.0 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, 2006-07-24 16:30:31+02:00, joerg@trift2. +11 -0
Merge trift2.:/M41/clone-4.1
into trift2.:/M50/merge-4.1-to-5.0
MERGE: 1.1616.2675.3
VC++Files/libmysqld/libmysqld.dsp@stripped, 2006-07-24 16:13:06+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.12.1.12
VC++Files/libmysqld/libmysqld.vcproj@stripped, 2006-07-24 16:13:07+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.1.1.2
VC++Files/libmysqld/libmysqld_ia64.dsp@stripped, 2006-07-24 16:13:07+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.2.1.1
VC++Files/mysqldemb/mysqldemb.dsp@stripped, 2006-07-24 16:13:07+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.11.1.1
VC++Files/sql/mysqld.dsp@stripped, 2006-07-24 16:13:07+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.17.1.19
VC++Files/sql/mysqld.vcproj@stripped, 2006-07-24 16:13:08+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.1.1.2
VC++Files/sql/mysqld_ia64.dsp@stripped, 2006-07-24 16:13:08+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.2.1.1
VC++Files/sql/mysqldmax.dsp@stripped, 2006-07-24 16:13:08+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.5.1.1
sql/field.cc@stripped, 2006-07-24 16:14:57+02:00, joerg@trift2. +0 -23
Merge a backport == Null-merge == "ul".
MERGE: 1.197.12.2
sql/field.h@stripped, 2006-07-24 16:15:46+02:00, joerg@trift2. +0 -1
Merge a backport == Null-merge == "ul".
MERGE: 1.120.1.12
sql/sql_locale.cc@stripped, 2006-07-24 16:29:54+02:00, joerg@trift2. +0 -109
Changes were already present (and even better) == Null-merge == "ul".
MERGE: 1.1.1.1
# 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: /M50/merge-4.1-to-5.0/RESYNC
--- 1.4/VC++Files/libmysqld/libmysqld_ia64.dsp 2006-07-24 16:30:39 +02:00
+++ 1.5/VC++Files/libmysqld/libmysqld_ia64.dsp 2006-07-24 16:30:39 +02:00
@@ -454,6 +454,10 @@
# End Source File
# Begin Source File
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\sql_manager.cpp
# End Source File
# Begin Source File
--- 1.3/VC++Files/sql/mysqld_ia64.dsp 2006-07-24 16:30:39 +02:00
+++ 1.4/VC++Files/sql/mysqld_ia64.dsp 2006-07-24 16:30:39 +02:00
@@ -1607,6 +1607,10 @@
# End Source File
# Begin Source File
+SOURCE=.\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_manager.cpp
# End Source File
# Begin Source File
--- 1.5/VC++Files/libmysqld/libmysqld.vcproj 2006-07-24 16:30:39 +02:00
+++ 1.6/VC++Files/libmysqld/libmysqld.vcproj 2006-07-24 16:30:39 +02:00
@@ -3306,6 +3306,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\sql\sql_locale.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;MYSQL_SERVER;LICENSE=Commercial;_MBCS;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="classic|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\sql\sql_manager.cpp">
<FileConfiguration
Name="Debug|Win32">
--- 1.8/VC++Files/sql/mysqld.vcproj 2006-07-24 16:30:39 +02:00
+++ 1.9/VC++Files/sql/mysqld.vcproj 2006-07-24 16:30:39 +02:00
@@ -6834,6 +6834,82 @@
</FileConfiguration>
</File>
<File
+ RelativePath="sql_locale.cpp">
+ <FileConfiguration
+ Name="classic nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Max|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Max nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="classic|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="sql_manager.cpp">
<FileConfiguration
Name="classic nt|Win32">
--- 1.43/VC++Files/sql/mysqld.dsp 2006-07-24 16:30:39 +02:00
+++ 1.44/VC++Files/sql/mysqld.dsp 2006-07-24 16:30:39 +02:00
@@ -1639,6 +1639,10 @@
# End Source File
# Begin Source File
+SOURCE=.\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_manager.cpp
# End Source File
# Begin Source File
--- 1.6/VC++Files/sql/mysqldmax.dsp 2006-07-24 16:30:39 +02:00
+++ 1.7/VC++Files/sql/mysqldmax.dsp 2006-07-24 16:30:39 +02:00
@@ -781,6 +781,22 @@
# End Source File
# Begin Source File
+SOURCE=.\sql_locale.cpp
+
+!IF "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_manager.cpp
# End Source File
# Begin Source File
--- 1.31/VC++Files/libmysqld/libmysqld.dsp 2006-07-24 16:30:39 +02:00
+++ 1.32/VC++Files/libmysqld/libmysqld.dsp 2006-07-24 16:30:39 +02:00
@@ -504,6 +504,10 @@
# End Source File
# Begin Source File
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\sql_manager.cpp
# End Source File
# Begin Source File
--- 1.12/VC++Files/mysqldemb/mysqldemb.dsp 2006-07-24 16:30:39 +02:00
+++ 1.13/VC++Files/mysqldemb/mysqldemb.dsp 2006-07-24 16:30:39 +02:00
@@ -359,6 +359,10 @@
SOURCE=..\sql\sql_list.cpp
# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
# Begin Source File
SOURCE=..\sql\sql_manager.cpp
| Thread |
|---|
| • bk commit into 5.0 tree (joerg:1.2216) | Joerg Bruehe | 24 Jul |
