1. 19 Jul, 2010 3 commits
    • Davi Arnaut's avatar
      Merge into mysql-trunk-merge.. · 84d2ae22
      Davi Arnaut authored
      84d2ae22
    • Jon Olav Hauglid's avatar
      manual merge from mysql-5.1-bugteam · 80371ba6
      Jon Olav Hauglid authored
      80371ba6
    • Jon Olav Hauglid's avatar
      Bug #54734 assert in Diagnostics_area::set_ok_status · 85e5ce0b
      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.
      85e5ce0b
  2. 16 Jul, 2010 6 commits
  3. 15 Jul, 2010 18 commits
  4. 14 Jul, 2010 13 commits
    • Davi Arnaut's avatar
      ddab5f84
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · d7944b62
      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.
      
      include/my_compiler.h:
        Drop aligned attribute support from Sun Studio C++ compiler
        as its not clear exactly which version of it supports the
        attribute.
      d7944b62
    • Marc Alff's avatar
      Implemented code review comments. · ef274484
      Marc Alff authored
      Fixed style according to the specific innodb style, for innodb code.
      ef274484
    • Marc Alff's avatar
      local merge · 4601a4b1
      Marc Alff authored
      4601a4b1
    • Marc Alff's avatar
      local merge · d6c0c882
      Marc Alff authored
      d6c0c882
    • Davi Arnaut's avatar
      7f1eedec
    • Davi Arnaut's avatar
      4972f4d8
    • Davi Arnaut's avatar
      Bug#48327: Some crashes specific to FreeBSD ("embedded") · ce789702
      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.
      ce789702
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · f317d3a6
      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.
      
      include/Makefile.am:
        Add new header.
      include/my_compiler.h:
        Add new header.
      include/my_global.h:
        Remove now-unnecessary macros.
      sql/spatial.cc:
        Make object creation functions return the object whose type
        was dynamically changed by the new placement.
        
        Move static method from the header in order to avoid having
        to access a forward declaration.
      sql/spatial.h:
        Object creation callbacks now take a array of chars as the
        storage area.
        
        Move create_by_typeid to a source file as to not access the
        forward declaration of Geometry_buffer.
        
        Ensure that Geometry_buffer is properly aligned.
      sql/sql_show.cc:
        Use newly added aligned storage helper.
      f317d3a6
    • Georgi Kodinov's avatar
      merge · 11b6ff0f
      Georgi Kodinov authored
      11b6ff0f
    • Georgi Kodinov's avatar
      Bug #51876: crash/memory underrun when loading data with ucs2 · dbb643d6
      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). 
      dbb643d6
    • Georgi Kodinov's avatar
      merge · ca82f434
      Georgi Kodinov authored
      ca82f434
    • Georgi Kodinov's avatar
      merge · 5ce3a5b2
      Georgi Kodinov authored
      5ce3a5b2