1. 19 Jul, 2010 3 commits
    • Davi Arnaut's avatar
      Merge into mysql-trunk-merge.. · 547673cb
      Davi Arnaut authored
      547673cb
    • Jon Olav Hauglid's avatar
      manual merge from mysql-5.1-bugteam · cc48ff50
      Jon Olav Hauglid authored
      cc48ff50
    • Jon Olav Hauglid's avatar
      Bug #54734 assert in Diagnostics_area::set_ok_status · b10bd9b9
      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.
      b10bd9b9
  2. 16 Jul, 2010 6 commits
  3. 15 Jul, 2010 18 commits
  4. 14 Jul, 2010 13 commits
    • Davi Arnaut's avatar
      67771595
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · 3f1dc0f0
      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.
      3f1dc0f0
    • Marc Alff's avatar
      Implemented code review comments. · 090583ad
      Marc Alff authored
      Fixed style according to the specific innodb style, for innodb code.
      090583ad
    • Marc Alff's avatar
      local merge · fe31f817
      Marc Alff authored
      fe31f817
    • Marc Alff's avatar
      local merge · 89ac1e15
      Marc Alff authored
      89ac1e15
    • Davi Arnaut's avatar
      41c62a2a
    • Davi Arnaut's avatar
      34d583be
    • Davi Arnaut's avatar
      Bug#48327: Some crashes specific to FreeBSD ("embedded") · eca410d5
      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.
      eca410d5
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · ccea4c3d
      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.
      ccea4c3d
    • Georgi Kodinov's avatar
      merge · f4025aa8
      Georgi Kodinov authored
      f4025aa8
    • Georgi Kodinov's avatar
      Bug #51876: crash/memory underrun when loading data with ucs2 · 4c519b48
      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). 
      4c519b48
    • Georgi Kodinov's avatar
      merge · bdfcb8bc
      Georgi Kodinov authored
      bdfcb8bc
    • Georgi Kodinov's avatar
      merge · 209c7723
      Georgi Kodinov authored
      209c7723