Commit 6dcecacf authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-bug11527
parents 5001e0a3 9f2d21f6

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1273,3 +1273,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

scripts/mysql_upgrade

VC++Files/mysql.sln

+121 −83

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/sql/gen_lex_hash.dsp

0 → 100644
+98 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="gen_lex_hash" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Console Application" 0x0103



CFG=gen_lex_hash - Win32 Debug

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "gen_lex_hash.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "gen_lex_hash.mak" CFG="gen_lex_hash - Win32 Debug"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "gen_lex_hash - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "gen_lex_hash - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

RSC=rc.exe



!IF  "$(CFG)" == "gen_lex_hash - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "gen_lex_hash___Win32_Release"

# PROP BASE Intermediate_Dir "gen_lex_hash___Win32_Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "gen_lex_hash___Win32_Release"

# PROP Intermediate_Dir "gen_lex_hash___Win32_Release"

# PROP Target_Dir ""

MTL=midl.exe

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD BASE RSC /l 0x419 /d "NDEBUG"

# ADD RSC /l 0x419 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386



!ELSEIF  "$(CFG)" == "gen_lex_hash - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# PROP Target_Dir ""

MTL=midl.exe

# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c

# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c

# ADD BASE RSC /l 0x419 /d "_DEBUG"

# ADD RSC /l 0x419 /d "_DEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept



!ENDIF 



# Begin Target



# Name "gen_lex_hash - Win32 Release"

# Name "gen_lex_hash - Win32 Debug"

# Begin Group "Source Files"



# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

# End Group

# Begin Group "Header Files"



# PROP Default_Filter "h;hpp;hxx;hm;inl"

# End Group

# Begin Group "Resource Files"



# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

# End Group

# End Target

# End Project

VC++Files/sql/gen_lex_hash.vcproj

0 → 100644
+158 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="windows-1251"?>

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="gen_lex_hash"

	ProjectGUID="{D593B5D1-8EFC-44FE-9937-A5AAD1E619A1}"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

		<Platform

			Name="Win32"/>

	</Platforms>

	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\Debug"

			IntermediateDirectory=".\Debug"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\Debug/gen_lex_hash.pch"

				AssemblerListingLocation=".\Debug/"

				ObjectFile=".\Debug/"

				ProgramDataBaseFileName=".\Debug/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="4"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="Ws2_32.lib"

				OutputFile="../sql/gen_lex_hash.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="../lib_release"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\Debug/gen_lex_hash.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\Debug/gen_lex_hash.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="_DEBUG"

				Culture="1049"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\gen_lex_hash___Win32_Release"

			IntermediateDirectory=".\gen_lex_hash___Win32_Release"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\gen_lex_hash___Win32_Release/gen_lex_hash.pch"

				AssemblerListingLocation=".\gen_lex_hash___Win32_Release/"

				ObjectFile=".\gen_lex_hash___Win32_Release/"

				ProgramDataBaseFileName=".\gen_lex_hash___Win32_Release/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="Ws2_32.lib"

				OutputFile="../sql/gen_lex_hash.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="../lib_release"

				ProgramDatabaseFile=".\gen_lex_hash___Win32_Release/gen_lex_hash.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\gen_lex_hash___Win32_Release/gen_lex_hash.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1049"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

	</Configurations>

	<References>

	</References>

	<Files>

		<Filter

			Name="Source Files"

			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

			<File

				RelativePath=".\gen_lex_hash.cpp">

			</File>

		</Filter>

		<Filter

			Name="Header Files"

			Filter="h;hpp;hxx;hm;inl">

		</Filter>

		<Filter

			Name="Resource Files"

			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

		</Filter>

	</Files>

	<Globals>

	</Globals>

</VisualStudioProject>

client/mysqlcheck.c

+9 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0, 
               opt_compress = 0, opt_databases = 0, opt_fast = 0,

               opt_medium_check = 0, opt_quick = 0, opt_all_in_1 = 0,

               opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0,

               tty_password = 0, opt_frm = 0;

               tty_password = 0, opt_frm = 0, opt_upgrade= 0;

static uint verbose = 0, opt_mysql_port=0;

static my_string opt_mysql_unix_port = 0;

static char *opt_password = 0, *current_user = 0,
@@ -78,6 +78,9 @@ static struct my_option my_long_options[] = 
  {"check-only-changed", 'C',

   "Check only tables that have changed since last check or haven't been closed properly.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"check-upgrade", 'g',

   "Check tables for version-dependent changes. May be used with --auto-repair to correct tables requiring version-dependent updates.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"compress", OPT_COMPRESS, "Use compression in server/client protocol.",

   (gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},
@@ -268,6 +271,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case 'r':

    what_to_do = DO_REPAIR;

    break;

  case 'g':

    what_to_do= DO_CHECK;

    opt_upgrade= 1;

    break;

  case 'W':

#ifdef __WIN__

    opt_protocol = MYSQL_PROTOCOL_PIPE;
@@ -525,6 +532,7 @@ static int handle_request_for_tables(char *tables, uint length) 
    if (opt_medium_check)       end = strmov(end, " MEDIUM"); /* Default */

    if (opt_extended)           end = strmov(end, " EXTENDED");

    if (opt_check_only_changed) end = strmov(end, " CHANGED");

    if (opt_upgrade)            end = strmov(end, " FOR UPGRADE");

    break;

  case DO_REPAIR:

    op = "REPAIR";