Commit 7b6c5a6b authored by unknown's avatar unknown
Browse files

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  rurik.mysql.com:/home/igor/mysql-5.1


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
parents 366d7afc f3f6514f

.bzrignore

+4 −0
Original line number Diff line number Diff line
@@ -1760,3 +1760,7 @@ zlib/*.ds? 
zlib/*.vcproj

mysql-test/r/*.log

client/mysql_upgrade

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

BUILD/test-alpha-ccc

deleted100755 → 0
+0 −11
Original line number Diff line number Diff line 
cd /usr/local/mysql

bin/mysqladmin shutdown

libexec/mysqld --basedir . &

cd sql-bench

rm output/*

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta"

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old

mv output/* output-ccc

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --fast

perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old --fast

mv output/* output-ccc

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 
			@sql_server@ scripts @man_dirs@ tests \

			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@ \

			plugin win

			mysql-test support-files @tools_dirs@ \

			plugin unittest win



DIST_SUBDIRS =		$(SUBDIRS) BUILD

VC++Files/copy_mysql_files.bat

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ REM Copy share, docs etc 
xcopy share\*.* c:\mysql\share /E /Y

xcopy scripts\*.* c:\mysql\scripts /E /Y

xcopy docs\*.* c:\mysql\docs /E /Y

xcopy sql-bench\*.* c:\mysql\bench /E /Y

copy docs\readme c:\mysql\



REM Copy privilege tables (Delete old ones as they may be from a newer version)

VC++Files/libmysqld/libmysqld.vcproj

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

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

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

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_DEBUG;SAFEMALLOC;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"
@@ -89,7 +89,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib"

				AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib,."

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__;LICENSE=Commercial"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -155,7 +155,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

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

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

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -221,7 +221,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib"

				AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib,."

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;USE_TLS;__WIN__;LICENSE=Commercial"

				StringPooling="TRUE"

				RuntimeLibrary="0"