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

Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 

into moonbone.local:/work/merge-5.0


sql/sql_select.cc:
  Auto merged
strings/ctype-mb.c:
  Auto merged
parents bdf32845 7bc46be1

.bzrignore

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

zlib/*.ds?

zlib/*.vcproj

BitKeeper/etc/RESYNC_TREE

VC++Files/mysql.sln

+11 −10
Original line number Diff line number Diff line
@@ -1110,8 +1110,8 @@ Global 
		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Release.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.ActiveCfg = TLS|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.Build.0 = TLS|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.ActiveCfg = Debug|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = Debug|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.ActiveCfg = TLS|Win32
@@ -1126,18 +1126,18 @@ Global 
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Release.Build.0 = TLS|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.ActiveCfg = Max|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.Build.0 = Max|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = Max|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.Build.0 = Max|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = Max nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.Build.0 = Max nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.Build.0 = Release|Win32

		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.ActiveCfg = classic|Win32
@@ -1427,6 +1427,7 @@ Global 
		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max.ActiveCfg = Release|Win32

		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max.Build.0 = Release|Win32

		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max nt.ActiveCfg = Release|Win32

		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.Max nt.Build.0 = Release|Win32

		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.nt.ActiveCfg = Release|Win32

		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.nt.Build.0 = Release|Win32

		{DA224DAB-5006-42BE-BB77-16E8BE5326D5}.pro.ActiveCfg = Release|Win32

VC++Files/mysys/mysys.vcproj

+101 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../zlib"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR"

				PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysys.pch"

				AssemblerListingLocation=".\debug/"
@@ -108,6 +108,56 @@ 
			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Max nt|Win32"

			OutputDirectory=".\max_nt"

			IntermediateDirectory=".\max_nt"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../zlib"

				PreprocessorDefinitions="__NT__;USE_SYMDIR;NDEBUG;DBUG_OFF;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\max_nt/mysys.pch"

				AssemblerListingLocation=".\max_nt/"

				ObjectFile=".\max_nt/"

				ProgramDataBaseFileName=".\max_nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile="..\lib_release\mysys-max-nt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release"
@@ -158,6 +208,56 @@ 
			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="nt|Win32"

			OutputDirectory=".\nt"

			IntermediateDirectory=".\nt"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../zlib"

				PreprocessorDefinitions="__NT__;DBUG_OFF;_WINDOWS;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\nt/mysys.pch"

				AssemblerListingLocation=".\nt/"

				ObjectFile=".\nt/"

				ProgramDataBaseFileName=".\nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile="..\lib_release\mysys-nt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="TLS_DEBUG|Win32"

			OutputDirectory=".\mysys___Win32_TLS_DEBUG"

VC++Files/sql/mysqld.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="__NT__;NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

client/mysqldump.c

+23 −1
Original line number Diff line number Diff line
@@ -1503,9 +1503,15 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
      field= mysql_fetch_field_direct(result, 0);

      if (strcmp(field->name, "View") == 0)

      {

        char *scv_buff = NULL;



        if (verbose)

          fprintf(stderr, "-- It's a view, create dummy table for view\n");



        /* save "show create" statement for later */

        if ((row= mysql_fetch_row(result)) && (scv_buff=row[1]))

          scv_buff= my_strdup(scv_buff, MYF(0));



        mysql_free_result(result);



        /*
@@ -1523,9 +1529,22 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
                    "SHOW FIELDS FROM %s", result_table);

        if (mysql_query_with_error_report(sock, 0, query_buff))

        {

          /*

            View references invalid or privileged table/col/fun (err 1356),

            so we cannot create a stand-in table.  Be defensive and dump

            a comment with the view's 'show create' statement. (Bug #17371)

          */



          if (mysql_errno(sock) == ER_VIEW_INVALID)

            fprintf(sql_file, "\n-- failed on view %s: %s\n\n", result_table, scv_buff ? scv_buff : "");



          my_free(scv_buff, MYF(MY_ALLOW_ZERO_PTR));



          safe_exit(EX_MYSQLERR);

          DBUG_RETURN(0); 

        }

        else

          my_free(scv_buff, MYF(MY_ALLOW_ZERO_PTR));



        if ((result= mysql_store_result(sock)))

        {
@@ -1566,6 +1585,9 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
        }

        mysql_free_result(result);



        if (path)

          my_fclose(sql_file, MYF(MY_WME));



        seen_views= 1;

        DBUG_RETURN(0);

      }