Commit ccd0ae3c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/extern/mysql/bk/mysql-5.0 

into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0


sql/sql_acl.cc:
  Auto merged
parents 718128db 596666f7

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1269,3 +1269,6 @@ vio/viotest.cpp 
zlib/*.ds?

zlib/*.vcproj

libmysqld/ha_blackhole.cc

client/my_user.c

libmysqld/my_user.c

sql/my_user.c

BUILD/Makefile.am

+21 −2
Original line number Diff line number Diff line
@@ -21,27 +21,46 @@ EXTRA_DIST = FINISH.sh \ 
			SETUP.sh \

			autorun.sh \

			check-cpu \

			cleanup \

			compile-alpha \

			compile-alpha-ccc \

			compile-alpha-cxx \

			compile-alpha-debug \

			compile-amd64-debug-max \

			compile-amd64-max \

			compile-darwin-mwcc \

			compile-dist \

			compile-hpux11-parisc2-aCC \

			compile-ia64-debug-max \

			compile-irix-mips64-mipspro \

			compile-pentium \

			compile-pentium-debug \

			compile-pentium-debug-max \

			compile-pentium-debug-max-no-embedded \

			compile-pentium-debug-max-no-ndb \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \

			compile-pentium-gcov \

			compile-pentium-gprof \

			compile-pentium-icc \

			compile-pentium-icc-valgrind-max \

			compile-pentium-icc-yassl \

			compile-pentium-max \

			compile-pentium-myodbc \

			compile-pentium-mysqlfs-debug \

			compile-pentium-pgcc \

			compile-pentium-valgrind-max \

			compile-pentium64-debug \

			compile-pentium64-debug-max \

			compile-pentium64-valgrind-max \

			compile-ppc \

			compile-ppc-debug \

			compile-ppc-debug-max \

			compile-ppc-debug-max-no-ndb \

			compile-ppc-max \

			compile-solaris-sparc \

			compile-solaris-sparc-debug \

			compile-irix-mips64-mipspro \

			compile-hpux11-parisc2-aCC \

			compile-solaris-sparc-forte \

			compile-solaris-sparc-purify

Docs/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -45,22 +45,22 @@ CLEAN_FILES: $(TXT_FILES) 
GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) $< "installing-source" "windows-source-build" > $@

	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) $< "windows-source-build" "post-installation" > $@

	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) $< "installing-binary" "installing-source" > $@

	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@

	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@

	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

%::SCCS/s.%

VC++Files/client/mysqldump.vcproj

+27 −0
Original line number Diff line number Diff line
@@ -226,6 +226,33 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_user.c">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

	</Files>

	<Globals>

	</Globals>

VC++Files/sql/mysqld.vcproj

+75 −0
Original line number Diff line number Diff line
@@ -3744,6 +3744,81 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_user.c">

			<FileConfiguration

				Name="classic nt|Win32">

				<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">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\myisammrg\myrg_rnext_same.c">

			<FileConfiguration