Commit 405177f1 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/mydev/mysql-5.1-bug11527
parents 026fd270 6ef92d62

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>

mysql-test/README

+33 −27
Original line number Diff line number Diff line 
This directory contains a test suite for mysql daemon. To run

This directory contains a test suite for the MySQL daemon. To run

the currently existing test cases, simply execute ./mysql-test-run in

this directory. It will fire up the newly built mysqld and test it.



If you want to run a test with a running MySQL server use the --extern

option to mysql-test-run. Please note that in this mode the test suite

expects user to specify test names to run. Otherwise it falls back to the

normal "non-extern" behaviour. The reason is that some tests

could not run with external server. Here is the sample command

to test "alias" and "analyze" tests on external server:



mysql-test-run --extern alias analyze



To match your setup you might also need to provide --socket, --user and

other relevant options.



Note that you do not have to have to do make install, and you could

actually have a co-existing MySQL installation - the tests will not

Note that you do not have to have to do "make install", and you could

actually have a co-existing MySQL installation. The tests will not

conflict with it.



All tests must pass. If one or more of them fail on your system, please

read the following manual section of how to report the problem:

read the following manual section for instructions on how to report the

problem:



http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html



If you want to use an already running MySQL server for specific tests,

use the --extern option to mysql-test-run. Please note that in this mode,

the test suite expects you to provide the names of the tests to run.

For example, here is the command to run the "alias" and "analyze" tests

with an external server:



mysql-test-run --extern alias analyze



To match your setup, you might also need to provide --socket, --user, and

other relevant options.



With no test cases named on the command line, mysql-test-run falls back

to the normal "non-extern" behavior. The reason for this is that some

tests cannot run with an external server.





You can create your own test cases. To create a test case:

You can create your own test cases. To create a test case, create a new

file in the t subdirectory using a text editor. The file should have a .test

extension. For example:



 xemacs t/test_case_name.test



 in the file, put a set of SQL commands that will create some tables,

 load test data, run some queries to manipulate it.

 In the file, put a set of SQL statements that create some tables,

 load test data, and run some queries to manipulate it.



 We would appreciate if the test tables were called t1, t2, t3 ... (to not

 We would appreciate it if you name your test tables t1, t2, t3 ... (to not

 conflict too much with existing tables).



 Your test should begin by dropping the tables you are going to create and

 end by dropping them again.  This will ensure that one can run the test

 over and over again.

 end by dropping them again.  This ensures that you can run the test over

 and over again.

 

 If you are using mysqltest commands (like result file names) in your

 test case you should do create the result file as follows:

 test case, you should create the result file as follows:



 mysql-test-run --record test_case_name
@@ -47,8 +53,8 @@ You can create your own test cases. To create a test case: 


 mysqltest --record < t/test_case_name.test



 If you only have a simple test cases consistent of SQL commands and comments

 you can create the test case one of the following ways:

 If you only have a simple test cases consisting of SQL statements and

 comments, you can create the test case in one of the following ways:



 mysql-test-run --record test_case_name
@@ -57,7 +63,7 @@ You can create your own test cases. To create a test case: 
 mysqltest --record --record-file=r/test_case_name.result < t/test_case_name.test



 When this is done, take a look at r/test_case_name.result

 - If the result is wrong, you have found a bug;  In this case you should

 - If the result is incorrect, you have found a bug. In this case, you should

   edit the test result to the correct results so that we can verify

   that the bug is corrected in future releases.

mysql-test/README.gcov

+9 −7
Original line number Diff line number Diff line 
To be able to see the level of coverage with the current test suite,

do the following:



  - make sure gcov is installed

  - compile with BUILD/compile-pentium-gcov ( if your machine is not pentium, hack

this script, or just live with the pentium-specific stuff)

  - ./mysql-test-run -gcov

  - to see the level of coverage for a given source file:

  - Make sure gcov is installed

  - Compile the MySQL distribution with BUILD/compile-pentium-gcov (if your

    machine does not have a pentium CPU, hack this script, or just live with

	the pentium-specific stuff)

  - In the mysql-test directory, run this command: ./mysql-test-run -gcov

  - To see the level of coverage for a given source file:

     grep source_file_name /tmp/gcov.out

  - to see which lines are not yet covered, look at source_file_name.gcov in the source tree. Then think hard about a test case that will cover those

  - To see which lines are not yet covered, look at source_file_name.gcov in

    the source tree. Then think hard about a test case that will cover those

    lines, and write one!

mysql-test/mysql-test-run.pl

+10 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ our $opt_big_test= 0; # Send --big-test to mysqltest 


our @opt_extra_mysqld_opt;



our $opt_comment;

our $opt_compress;

our $opt_ssl;

our $opt_skip_ssl;
@@ -669,6 +670,14 @@ sub command_line_setup () { 
    print '#' x 78, "\n\n";

  }



  if ( $opt_comment )

  {

    print "\n";

    print '#' x 78, "\n";

    print "# $opt_comment\n";

    print '#' x 78, "\n\n";

  }



  foreach my $arg ( @ARGV )

  {

    if ( $arg =~ /^--skip-/ )
@@ -3256,6 +3265,7 @@ Options for coverage, profiling etc 


Misc options



  comment=STR           Write STR to the output

  verbose               Verbose output from this script

  script-debug          Debug this script itself

  timer                 Show test case execution time