diff options
| author | kent@mysql.com <> | 2006-02-12 19:36:21 +0100 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-02-12 19:36:21 +0100 |
| commit | 633cd034683da1a30eed204edb819be8ed753c1b (patch) | |
| tree | 26469e1bb8253911f3b8431451f78bcf2458124a | |
| parent | f9a23667b2037caeb4da7cd2672d53bcce496e1e (diff) | |
| download | mariadb-git-633cd034683da1a30eed204edb819be8ed753c1b.tar.gz | |
disabled.def:
Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
Added "my_user.c"
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.vcproj | 36 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj index eb411f79362..7dff2ff865b 100644 --- a/VC++Files/libmysqld/libmysqld.vcproj +++ b/VC++Files/libmysqld/libmysqld.vcproj @@ -2011,6 +2011,42 @@ </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 Name="Debug|Win32"> diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 09a11578096..34efa554010 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -13,3 +13,4 @@ sp-goto : GOTO is currently is disabled - will be fixed in the future subselect : Bug#15706 ndb_load : Bug #17233 +rpl_until : Unstable test case, bug#15886 |