Commit b974fa85 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.0-kt 

into  mysql.com:/home/hf/work/mysql-5.0.clean


sql-common/client.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
parents d2d898e7 a7dddd3b

.bzrignore

+11 −3
Original line number Diff line number Diff line 
*.Plo

*.Po

*.a

*.bb

*.bbg
@@ -9,6 +11,7 @@ 
*.gcov

*.idb

*.la

*.lai

*.lib

*.lo

*.map
@@ -20,6 +23,7 @@ 
*.res

*.sbr

*.so

*.so.*

*.spec

*/*_pure_*warnings

*/.pure
@@ -48,6 +52,7 @@ 
50

=6

BUILD/compile-pentium-maintainer

BitKeeper/etc/RESYNC_TREE

BitKeeper/etc/config

BitKeeper/etc/csets

BitKeeper/etc/csets-in
@@ -279,6 +284,7 @@ build_tags.sh 
client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/.libs -prune

client/completion_hash.cpp

client/decimal.c

client/insert_test
@@ -558,6 +564,7 @@ libmysqld/sql_insert.cc 
libmysqld/sql_lex.cc

libmysqld/sql_list.cc

libmysqld/sql_load.cc

libmysqld/sql_locale.cc

libmysqld/sql_manager.cc

libmysqld/sql_map.cc

libmysqld/sql_olap.cc
@@ -669,6 +676,7 @@ mysql-test/mysql-test-run.log 
mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/alter_table.err
@@ -1061,6 +1069,7 @@ scripts/mysql_secure_installation 
scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_upgrade_shell

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug
@@ -1262,6 +1271,7 @@ test1/* 
test_xml

tests/*.ds?

tests/*.vcproj

tests/.libs -prune

tests/client_test

tests/connect_test

tests/mysql_client_test
@@ -1269,6 +1279,7 @@ thr_insert_test/* 
thr_test/*

thread_test

tmp/*

tools/.libs -prune

tools/my_vsnprintf.c

tools/mysqlmanager

tools/mysqlmngd
@@ -1285,6 +1296,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
BitKeeper/etc/RESYNC_TREE

mysql-test/r/*.log

scripts/mysql_upgrade_shell

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -623,6 +623,10 @@ SOURCE=..\sql\time.cpp 
SOURCE=..\sql\tztime.cpp

# End Source File

# Begin Source File

#

SOURCE=..\sql\sql_locale.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\uniques.cpp

# End Source File

VC++Files/libmysqld/libmysqld.vcproj

+36 −0
Original line number Diff line number Diff line
@@ -4313,6 +4313,42 @@ 
					PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\sql_locale.cpp">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__;$(NoInherit)"

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;MYSQL_SERVER;LICENSE=Commercial;_MBCS;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;$(NoInherit)"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;$(NoInherit)"/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\uniques.cpp">

			<FileConfiguration

VC++Files/sql/mysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -2023,6 +2023,10 @@ SOURCE=.\tztime.cpp 
# End Source File

# Begin Source File



SOURCE=.\sql_locale.cpp

# End Source File

# Begin Source File



SOURCE=.\uniques.cpp

# End Source File

# Begin Source File

VC++Files/sql/mysqld.vcproj

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

			</FileConfiguration>

		</File>

		<File

			RelativePath="sql_locale.cpp">

			<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="uniques.cpp">

			<FileConfiguration