MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:August 9 2010 1:29pm
Subject:bzr commit into mysql-next-mr-bugfixing branch (davi:3196)
View as plain text  
# At a local mysql-next-mr-bugfixing repository of davi

 3196 Davi Arnaut	2010-08-09 [merge]
      Merge of mysql-trunk-bugfixing into mysql-next-mr-bugfixing.

    modified:
      CMakeLists.txt
      configure.in
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-08-06 13:17:51 +0000
+++ b/CMakeLists.txt	2010-08-09 13:26:04 +0000
@@ -161,13 +161,6 @@ IF(ENABLE_DEBUG_SYNC)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
 ENDIF() 
  
-OPTION(WITH_ERROR_INJECT 
-  "Enable error injection in MySQL Server (debug builds only)" OFF) 
-IF(WITH_ERROR_INJECT) 
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DERROR_INJECT_SUPPORT") 
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DERROR_INJECT_SUPPORT") 
-ENDIF() 
-
 OPTION(ENABLED_LOCAL_INFILE
  "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
 MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)

=== modified file 'configure.in'
--- a/configure.in	2010-08-06 13:21:26 +0000
+++ b/configure.in	2010-08-09 13:29:34 +0000
@@ -1734,7 +1734,7 @@ then
 fi
 
 AC_ARG_WITH(debug,
-    [AS_HELP_STRING([--with-debug], [Add debug code @<:@default=no@:>@])]
+    [AS_HELP_STRING([--with-debug], [Add debug code @<:@default=no@:>@])],
     [with_debug=$withval],
     [with_debug=no])
 if test "$with_debug" = "yes"
@@ -1777,21 +1777,6 @@ else
   AC_MSG_RESULT([no])
 fi
 
-# If we should allow error injection tests
-AC_ARG_WITH(error-inject,
-    AC_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
-    [ with_error_inject=$withval ],
-    [ with_error_inject=no ])
-
-if test $with_debug != "no"
-then
-  if test "$with_error_inject" = "yes"
-  then
-    AC_DEFINE([ERROR_INJECT_SUPPORT], [1],
-              [Enable error injection in MySQL Server])
-  fi
-fi
-
 AC_ARG_WITH([fast-mutexes],
 	    AC_HELP_STRING([--with-fast-mutexes], 
 	    [Compile with fast mutexes (default is disabled)]),


Attachment: [text/bzr-bundle] bzr/davi.arnaut@oracle.com-20100809132934-yhsk24hul5jzi2lq.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (davi:3196) Davi Arnaut9 Aug