Commit bd56dd7e authored by unknown's avatar unknown
Browse files

Merge 


VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
parents 11ba97eb 5baf17fe

VC++Files/libmysqld/libmysqld.vcproj

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

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql-common\my_user.c">

			<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\net_serv.cpp">

			<FileConfiguration

mysql-test/t/disabled.def

+24 −24
Original line number Diff line number Diff line
@@ -10,28 +10,28 @@ 
#

##############################################################################



sp-goto         : GOTO is currently is disabled - will be fixed in the future

rpl_bit_npk     : Bug #13418

events               : Test case instability - infinite locking. To be fixed.

func_group           : Bug#15448

func_math            : Bug#15448

group_min_max        : Bug#15448 

innodb_concurrent : Results are not deterministic, Elliot will fix (BUG#3300)

innodb_unsafe_binlog : re-enable with InnoDB 5.1 snapshot containing bug#15650

subselect       : Bug#15706

ps_7ndb         : dbug assert in RBR mode when executing test suite

rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly

partition_03ndb : Bug#16385

ndb_binlog_basic   : Results are not deterministic, Tomas will fix

rpl_ndb_basic   : Bug#16228

rpl_sp          : Bug #16456

innodb_concurrent    : Results are not deterministic, Elliot will fix (bug#3300) [BUG CLOSED]

innodb_unsafe_binlog : re-enable with InnoDB 5.1 snapshot containing bug#15650 [BUG CLOSED]

#ndb_alter_table_row : sometimes wrong error 1015!=1046

ndb_autodiscover     : Needs to be fixed w.r.t binlog

ndb_autodiscover2    : Needs to be fixed w.r.t binlog

#ndb_alter_table_row : sometimes wrong error 1015!=1046

ndb_binlog_basic     : Results are not deterministic, Tomas will fix

ndb_binlog_ddl_multi : Bug#17038 [PATCH PENDING]

ndb_gis              : garbled msgs from corrupt THD*

rpl_ndb_auto_inc : MySQL Bugs:17086

rpl_ndb_relay_space : Bug 16993

ndb_binlog_ddl_multi : Bug #17038

rpl_ndb_log : MySQL Bugs: #17158

subselect       : Bug#15706

ndb_load             : Bug#17233

partition_03ndb      : Bug#16385

ps_7ndb              : dbug assert in RBR mode when executing test suite

rpl_bit_npk          : Bug#13418

rpl_ddl              : Bug#15963 SBR does not show "Definer" correctly

rpl_ndb_auto_inc     : Bug#17086

rpl_ndb_basic        : Bug#16228 [IN REVIEW]

rpl_ndb_log          : Bug#17081 [BUG CLOSED]

rpl_ndb_relay_space  : Bug#16993

rpl_sp               : Bug#16456

rpl_until            : Unstable test case, bug#15886

sp-goto              : GOTO is currently is disabled - will be fixed in the future

subselect            : Bug#15706 (ps mode) [PATCH PENDING]