1. 19 Jul, 2010 3 commits
    • Davi Arnaut's avatar
      Merge into mysql-trunk-merge.. · ce2403e6
      Davi Arnaut authored
      ce2403e6
    • Jon Olav Hauglid's avatar
      manual merge from mysql-5.1-bugteam · d4885416
      Jon Olav Hauglid authored
      d4885416
    • Jon Olav Hauglid's avatar
      Bug #54734 assert in Diagnostics_area::set_ok_status · 4b2378a1
      Jon Olav Hauglid authored
      This assert checks that the server does not try to send OK to the
      client if there has been some error during processing. This is done
      to make sure that the error is in fact sent to the client.
      
      The problem was that view errors during processing of WHERE conditions
      in UPDATE statements where not detected by the update code. It therefore
      tried to send OK to the client, triggering the assert.
      The bug was only noticeable in debug builds.
      
      This patch fixes the problem by making sure that the update code
      checks for errors during condition processing and acts accordingly.
      4b2378a1
  2. 16 Jul, 2010 6 commits
  3. 15 Jul, 2010 18 commits
  4. 14 Jul, 2010 13 commits
    • Davi Arnaut's avatar
      6f6be1e7
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · d5e8508f
      Davi Arnaut authored
                 strict aliasing violations.
      
      Post-merge fix: include my_compiler.h before my_attribute.h
      as the latter will undef __attribute__ if the compiler is not
      GCC. Based on the compiler version, in my_compiler.h we know
      for sure whether the aligned attribute is supported. Furthermore,
      undefining attribute might cause bugs if some system header
      uses it.
      d5e8508f
    • Marc Alff's avatar
      Implemented code review comments. · 508522e5
      Marc Alff authored
      Fixed style according to the specific innodb style, for innodb code.
      508522e5
    • Marc Alff's avatar
      local merge · adf29ed6
      Marc Alff authored
      adf29ed6
    • Marc Alff's avatar
      local merge · 805854ca
      Marc Alff authored
      805854ca
    • Davi Arnaut's avatar
      e29211c3
    • Davi Arnaut's avatar
      dbf41f9f
    • Davi Arnaut's avatar
      Bug#48327: Some crashes specific to FreeBSD ("embedded") · dbef812a
      Davi Arnaut authored
      Backport fixes from ndb: Rework the constructors of some static
      object's to not call dbug functions since the constructors will
      be called before main, and consequently, before the dbug library
      is initialized.
      dbef812a
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · 21f63caf
      Davi Arnaut authored
                 strict aliasing violations.
      
      Another rather noisy violation of strict aliasing rules
      is the spatial code which makes use of stack-based memory
      (of type Geometry_buffer) to provide placement for Geometry
      objects. Although a placement new is allowed to dynamically
      change the type of a object, the object returned by the
      new placement was being ignored and the original stack-based
      object was being casted to the new type, thus violating strict
      aliasing rules.
      
      The solution is to reorganize the code so that the object
      returned by the new placement is used instead of casting the
      original object. Also, to ensure that the stack-based object
      is properly aligned with respect to the objects it provides
      placement for, a set of compiler-dependent macros and types
      are introduced so that the alignment of objects can be inquired
      and specified.
      21f63caf
    • Georgi Kodinov's avatar
      merge · a1414d51
      Georgi Kodinov authored
      a1414d51
    • Georgi Kodinov's avatar
      Bug #51876: crash/memory underrun when loading data with ucs2 · b4766fc3
      Georgi Kodinov authored
      and reverse() function
            
      3 problems fixed : 
      1. The reported problem : caused by incorrect parsing of 
      the file as ucs data resulting in wrong length of the parsed
      string. Fixed by truncating the invalid trailing bytes 
      (non-complete multibyte characters) when reading from the file
      2. LOAD DATA when reading from a proper UCS2 file wasn't 
      recognizing the new line characters. Fixed by first looking 
      if a byte is a new line (or any other special) character before
      reading it as a part of a multibyte character.
      3. When using user variables to hold the column data in LOAD
      DATA the character set of the user variable was set incorrectly
      to the database charset. Fixed by setting it to the charset
      specified by LOAD DATA (if any). 
      b4766fc3
    • Georgi Kodinov's avatar
      merge · 9952c560
      Georgi Kodinov authored
      9952c560
    • Georgi Kodinov's avatar
      merge · 7965b2d0
      Georgi Kodinov authored
      7965b2d0