Commit 5383ac93 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mysql-5.1.18518 

into mysql.com:/home/hf/work/mysql-5.1.mrg


sql/sql_parse.cc:
  Auto merged
parents 7fb64e0f 9a616e23

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ SOURCE=..\sql-common\my_time.c 
# End Source File

# Begin Source File

 

SOURCE=..\sql-common\my_user.c

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

VC++Files/libmysqld/libmysqld_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,10 @@ SOURCE="..\sql-common\my_time.c" 
# End Source File

# Begin Source File



SOURCE="..\sql-common\my_user.c"

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

VC++Files/mysql.sln

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ EndProject 
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_client_test", "tests\mysql_client_test.vcproj", "{DA224DAB-5006-42BE-BB77-16E8BE5326D5}"

	ProjectSection(ProjectDependencies) = postProject

		{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}

		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}

	EndProjectSection

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlmanager", "server-tools\instance-manager\mysqlmanager.vcproj", "{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}"

VC++Files/mysys/mysys.vcproj

+43 −0
Original line number Diff line number Diff line
@@ -3232,6 +3232,49 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_memmem.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=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="TLS|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_messnc.c">

			<FileConfiguration

client/mysql_upgrade.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int main(int argc, char **argv) 
    b_read= my_read(check_file, chf_buffer, sizeof(chf_buffer)-1, MYF(0));

    chf_buffer[b_read]= 0;

    my_close(check_file, MYF(0));

    if (!strcmp(chf_buffer, VERSION))

    if (!strcmp(chf_buffer, MYSQL_SERVER_VERSION))

    {

      if (opt_verbose)

        puts("mysql_upgrade already done for this version");