MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:August 9 2010 1:27pm
Subject:bzr push into mysql-trunk-bugfixing branch (davi:3190 to 3191)
View as plain text  
 3191 Davi Arnaut	2010-08-09 [merge]
      Merge of mysql-5.5-bugfixing into mysql-trunk-bugfixing.

    modified:
      CMakeLists.txt
      configure.in
 3190 Alfranio Correia	2010-08-08
      BUG#50312 Warnings for unsafe sub-statement not returned to client
                        
      After BUG#36649, warnings for sub-statements are cleared when a 
      new sub-statement is started. This is problematic since it suppresses
      warnings for unsafe statements in some cases. It is important that we
      always give a warning to the client, because the user needs to know
      when there is a risk that the slave goes out of sync.
                        
      We fixed the problem by generating warning messages for unsafe statements
      while returning from a stored procedure, function, trigger or while
      executing a top level statement.
                        
      We also started checking unsafeness when both performance and log tables are
      used. This is necessary after the performance schema which does a distinction
      between performance and log tables.
     @ mysql-test/extra/rpl_tests/create_recursive_construct.inc
        Changed the order of the calls in the procedure because the code
        that checks if a warning message is printed out expects that the
        first statement gives an warning what is not the case for INSERT
        INTO ta$CRC_ARG_level VALUES (47);
     @ mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
        Updated the result file.
     @ mysql-test/suite/binlog/r/binlog_unsafe.result
        There are several changes here:
        
        (1) - Changed the CREATE PROCEDURE $CRC.
                                
        (2) - The procedure $CRC was failing and the content of the binlog
              was being printed out, after fix (1) the failure disappeared.
                                
        (3) - The warning message for unsafeness due to auto-increment collumns was
              changed.
                                
        (4) - The warning message for unsafeness due to VERSION(), RAND() was changed.
     @ mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
        Tested filters.
     @ mysql-test/suite/binlog/t/binlog_unsafe.test
        Reenabled the test case binlog_unsafe.
     @ mysql-test/suite/binlog/t/disabled.def
        Reenabled the test case binlog_unsafe.
     @ mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
        Updated the result file.
     @ mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
        Updated the result file.
     @ mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
        Updated the result file.
     @ sql/binlog.cc
        Changed the routine in the THD::binlog_query that prints the warning
        messages to avoid trying to print them when inside a stored procedure,
        function or trigger.
                                
        Checked for unsafeness when both performance and log tables where used.
        After the introduction of the performance schema, we need to check both.
     @ sql/sql_class.cc
        Moved the stmt_accessed_table_flag variable and related information to the
        LEX as we need the variable reset after each statement even inside a stored
        procedure, what did not happen if the information was in the THD.

    modified:
      mysql-test/extra/rpl_tests/create_recursive_construct.inc
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      sql/binlog.cc
      sql/log_event.cc
      sql/sp_head.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
=== 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:17:51 +0000
+++ b/configure.in	2010-08-09 13:26:04 +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-20100809132604-8ss1wuw0jgw92nsu.bundle
Thread
bzr push into mysql-trunk-bugfixing branch (davi:3190 to 3191) Davi Arnaut9 Aug