1. 12 Aug, 2010 3 commits
  2. 11 Aug, 2010 1 commit
  3. 12 Aug, 2010 1 commit
  4. 10 Aug, 2010 2 commits
    • Jonathan Perkin's avatar
      Merge to mysql-5.5-bugfixing · 66972aa2
      Jonathan Perkin authored
      66972aa2
    • Alfranio Correia's avatar
      BUG#50312 Warnings for unsafe sub-statement not returned to client · bd3aa7eb
      Alfranio Correia authored
                              
      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.
      bd3aa7eb
  5. 09 Aug, 2010 7 commits
  6. 06 Aug, 2010 1 commit
  7. 05 Aug, 2010 5 commits
    • Bjorn Munch's avatar
      merge from trunk-mtr · f886745d
      Bjorn Munch authored
      f886745d
    • Bjorn Munch's avatar
      upmerge 55582 · 489e6c13
      Bjorn Munch authored
      489e6c13
    • Davi Arnaut's avatar
      Bug#55601: BUILD/check-cpu in mysql-trunk is broken on Mac OS X 10.5 · 37da529d
      Davi Arnaut authored
      Restore the original behavior of check-cpu with respect to core2.
      It isn't used as a actual target processor type, but as a mean to
      perform other kinds of architecture checks.
      37da529d
    • Vladislav Vaintroub's avatar
      Build cleanups · ff1ee261
      Vladislav Vaintroub authored
      - Simplify sql-bench installation, 
      do not try to resolve names : this leads to probem
      if builddir is symlink located on different filesystem.
      (reported by alik)
      
      - Make WITHOUT_XXX (disabling plugin) work for DEFAULT
      plugins. Prior to the patch is behaved just like 
      MANDATORY.
      
      - LINK_LIBRARIES in MYSQL_ADD_PLUGIN had no effect for
      statically linked plugins.
      
      - Fix constant rebuild of initdb target on Windows.
      ff1ee261
    • Evgeny Potemkin's avatar
      Auto-merged. · 1eb9375a
      Evgeny Potemkin authored
      1eb9375a
  8. 04 Aug, 2010 4 commits
  9. 03 Aug, 2010 1 commit
  10. 02 Aug, 2010 3 commits
  11. 31 Jul, 2010 3 commits
  12. 30 Jul, 2010 4 commits
    • Davi Arnaut's avatar
      Revert revision which disabled the generating of configuration · b5c8757a
      Davi Arnaut authored
      scripts if cmake is available. We need to always generate the
      scripts in order for the dual cmake/autotools support to work.
      b5c8757a
    • Alexander Nozdrin's avatar
      Update .bzrignore. · d285d75d
      Alexander Nozdrin authored
      d285d75d
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · b2f80050
      Alexander Nozdrin authored
      ******
      This patch fixes the following bugs:
        - Bug#5889: Exit handler for a warning doesn't hide the warning in
          trigger
        - Bug#9857: Stored procedures: handler for sqlwarning ignored
        - Bug#23032: Handlers declared in a SP do not handle warnings generated
          in sub-SP
        - Bug#36185: Incorrect precedence for warning and exception handlers
      
      The problem was in the way warnings/errors during stored routine execution
      were handled. Prior to this patch the logic was as follows:
      
        - when a warning/an error happens: if we're executing a stored routine,
          and there is a handler for that warning/error, remember the handler,
          ignore the warning/error and continue execution.
      
        - after a stored routine instruction is executed: check for a remembered
          handler and activate one (if any).
      
      This logic caused several problems:
      
        - if one instruction generates several warnings (errors) it's impossible
          to choose the right handler -- a handler for the first generated
          condition was chosen and remembered for activation.
      
        - mess with handling conditions in scopes different from the current one.
      
        - not putting generated warnings/errors into Warning Info (Diagnostic
          Area) is against The Standard.
      
      The patch changes the logic as follows:
      
        - Diagnostic Area is cleared on the beginning of each statement that
          either is able to generate warnings, or is able to work with tables.
      
        - at the end of a stored routine instruction, Diagnostic Area is left
          intact.
      
        - Diagnostic Area is checked after each stored routine instruction. If
          an instruction generates several condition, it's now possible to take a
          look at all of them and determine an appropriate handler.
      b2f80050
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · 02a0787d
      Alexander Nozdrin authored
      02a0787d
  13. 29 Jul, 2010 5 commits