From: knielsen
Date: December 22 2005 12:18pm
Subject: bk commit into 5.1 tree (knielsen:1.1982)
List-Archive: http://lists.mysql.com/commits/361
Message-Id: <E1EpPOe-0005o0-59@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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
  1.1982 05/12/22 13:18:06 knielsen@stripped +3 -0
  Cleanup "make dist" and Windows builds after push of pluggable storage engines.

  libmysqld/Makefile.am
    1.74 05/12/22 13:17:42 knielsen@stripped +1 -1
    Cleanup "make dist" and Windows builds after push of pluggable storage engines.

  VC++Files/sql/mysqld.vcproj
    1.6 05/12/22 13:17:42 knielsen@stripped +0 -81
    Cleanup "make dist" and Windows builds after push of pluggable storage engines.

  VC++Files/sql/mysqld.dsp
    1.43 05/12/22 13:17:42 knielsen@stripped +0 -4
    Cleanup "make dist" and Windows builds after push of pluggable storage engines.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new

--- 1.5/VC++Files/sql/mysqld.vcproj	2005-11-26 19:21:17 +01:00
+++ 1.6/VC++Files/sql/mysqld.vcproj	2005-12-22 13:17:42 +01:00
@@ -1491,87 +1491,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="examples\ha_example.cpp">
-			<FileConfiguration
-				Name="classic nt|Win32"
-				ExcludedFromBuild="TRUE">
-				<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"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="pro nt|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="pro|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="classic|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-		</File>
-		<File
 			RelativePath="ha_federated.cpp">
 			<FileConfiguration
 				Name="classic nt|Win32"

--- 1.42/VC++Files/sql/mysqld.dsp	2005-11-30 21:14:07 +01:00
+++ 1.43/VC++Files/sql/mysqld.dsp	2005-12-22 13:17:42 +01:00
@@ -460,10 +460,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\examples\ha_example.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\ha_blackhole.cpp
 # End Source File
 # Begin Source File

--- 1.73/libmysqld/Makefile.am	2005-12-21 14:10:25 +01:00
+++ 1.74/libmysqld/Makefile.am	2005-12-22 13:17:42 +01:00
@@ -69,7 +69,7 @@
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
 EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \
 			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \
-			ha_tina.cc ha_example.cc ha_partition.cc
+			ha_partition.cc
 libmysqld_a_DEPENDENCIES= @mysql_se_objs@
 libmysqld_a_SOURCES=