1. 03 Dec, 2010 2 commits
  2. 30 Nov, 2010 1 commit
  3. 26 Nov, 2010 2 commits
  4. 25 Nov, 2010 1 commit
  5. 24 Nov, 2010 8 commits
    • Gleb Shchepa's avatar
      backport of bug #54461 from 5.1-security to 5.0-security · a30e9dda
      Gleb Shchepa authored
       > revision-id: gshchepa@mysql.com-20100801181236-uyuq6ewaq43rw780
       > parent: alexey.kopytov@sun.com-20100723115254-jjwmhq97b9wl932l
       > committer: Gleb Shchepa <gshchepa@mysql.com>
       > branch nick: mysql-5.1-security
       > timestamp: Sun 2010-08-01 22:12:36 +0400
       > Bug #54461: crash with longblob and union or update with subquery
       >
       > Queries may crash, if
       >   1) the GREATEST or the LEAST function has a mixed list of
       >      numeric and LONGBLOB arguments and
       >   2) the result of such a function goes through an intermediate
       >      temporary table.
       >
       > An Item that references a LONGBLOB field has max_length of
       > UINT_MAX32 == (2^32 - 1).
       >
       > The current implementation of GREATEST/LEAST returns REAL
       > result for a mixed list of numeric and string arguments (that
       > contradicts with the current documentation, this contradiction
       > was discussed and it was decided to update the documentation).
       >
       > The max_length of such a function call was calculated as a
       > maximum of argument max_length values (i.e. UINT_MAX32).
       >
       > That max_length value of UINT_MAX32 was used as a length for
       > the intermediate temporary table Field_double to hold
       > GREATEST/LEAST function result.
       >
       > The Field_double::val_str() method call on that field
       > allocates a String value.
       >
       > Since an allocation of String reserves an additional byte
       > for a zero-termination, the size of String buffer was
       > set to (UINT_MAX32 + 1), that caused an integer overflow:
       > actually, an empty buffer of size 0 was allocated.
       >
       > An initialization of the "first" byte of that zero-size
       > buffer with '\0' caused a crash.
       >
       > The Item_func_min_max::fix_length_and_dec() has been
       > modified to calculate max_length for the REAL result like
       > we do it for arithmetical operators.
      
      
      mysql-test/r/func_misc.result:
        Test case for bug #54461.
      mysql-test/t/func_misc.test:
        Test case for bug #54461.
      sql/item_func.cc:
        Bug #54461: crash with longblob and union or update with subquery
        
        The Item_func_min_max::fix_length_and_dec() has been
        modified to calculate max_length for the REAL result like
        we do it for arithmetical operators.
      a30e9dda
    • Alexander Nozdrin's avatar
      Merge from mysql-5.0-security. · 3ee4964c
      Alexander Nozdrin authored
      3ee4964c
    • Alexander Nozdrin's avatar
      A follow-up for Bug#58339 (Replace Server GPL README file). · 14b38121
      Alexander Nozdrin authored
      Fix formatting issues in README file.
      14b38121
    • Alexander Nozdrin's avatar
      Empty merge from mysql-5.0-security. · dde10d4b
      Alexander Nozdrin authored
      dde10d4b
    • Alexander Nozdrin's avatar
      Merge from mysql-5.1-bugteam. · 9cf37e24
      Alexander Nozdrin authored
      9cf37e24
    • Alexander Nozdrin's avatar
      Merge from mysql-5.0-bugteam. · 523a4745
      Alexander Nozdrin authored
      523a4745
    • Alexander Nozdrin's avatar
      Merge from mysql-5.0-bugteam. · 1e43b94c
      Alexander Nozdrin authored
      1e43b94c
    • Alexander Nozdrin's avatar
      A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all · 85f855e0
      Alexander Nozdrin authored
      EXCEPTIONS-CLIENT from all the places.
      85f855e0
  6. 23 Nov, 2010 4 commits
    • Ramil Kalimullin's avatar
      binlog.binlog_row_failure_mixing_engines test disabled. · 698c9c3a
      Ramil Kalimullin authored
      See bug #58416.
      698c9c3a
    • Ramil Kalimullin's avatar
      Auto-merge with mysql-5.1-bugteam. · 55114ee2
      Ramil Kalimullin authored
      55114ee2
    • Ramil Kalimullin's avatar
      Auto-merge with mysql-5.0-bugteam. · 787e41d2
      Ramil Kalimullin authored
      787e41d2
    • Sergey Glukhov's avatar
      Bug#56862 Execution of a query that uses index merge returns a wrong result · cf0cc723
      Sergey Glukhov authored
      In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates
      temporary file where is stores row ids which meet QUICK_SELECT ranges
      except of clustered pk range, clustered range is processed separately.
      In init_read_record we check if temporary file is used and choose
      appropriate record access method. It does not take into account that
      temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT
      with clustered pk range.
      The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT
      with clustered pk range is used.
      
      
      mysql-test/suite/innodb/r/innodb_mysql.result:
        test case
      mysql-test/suite/innodb/t/innodb_mysql.test:
        test case
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result:
        test case
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test:
        test case
      sql/opt_range.h:
        added new method
      sql/records.cc:
        The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT
        with clustered pk range is used.
      cf0cc723
  7. 22 Nov, 2010 7 commits
    • Gleb Shchepa's avatar
      empty upmerge after backport of bug 55568 · 65f94002
      Gleb Shchepa authored
      5.0-security --> 5.1-security
      65f94002
    • Gleb Shchepa's avatar
      backport: Bug #55568 from 5.1-security to 5.0-security · 47bb750c
      Gleb Shchepa authored
      > revision-id: alexey.kopytov@sun.com-20100824103548-ikm79qlfrvggyj9h
      > parent: sunny.bains@oracle.com-20100816001222-xqc447tr6jwh8c53
      > committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
      > branch nick: 5.1-security
      > timestamp: Tue 2010-08-24 14:35:48 +0400
      > message:
      >   Bug #55568: user variable assignments crash server when used
      >               within query
      >   
      >   The server could crash after materializing a derived table
      >   which requires a temporary table for grouping.
      >   
      >   When destroying the temporary table used to execute a query for
      >   a derived table, JOIN::destroy() did not clean up Item_fields
      >   pointing to fields in the temporary table. This led to
      >   dereferencing a dangling pointer when printing out the items
      >   tree later in the outer SELECT.
      >   
      >   The solution is an addendum to the patch for bug37362: in
      >   addition to cleaning up items in tmp_all_fields3, do the same
      >   for items in tmp_all_fields1, since now we have an example
      >   where this is necessary.
      
      
      sql/field.cc:
        Make sure field->table_name is not set to NULL in
        Field::make_field() to avoid assertion failure in 
        Item_field::make_field() after cleaning up items
        (the assertion fired in udf.test when running
        the test suite with the patch applied).
      sql/sql_select.cc:
        In addition to cleaning up items in tmp_all_fields3, do the
        same for items in tmp_all_fields1.
        Introduce a new helper function to avoid code duplication.
      sql/sql_select.h:
        Introduce a new helper function to avoid code duplication in
        JOIN::destroy().
      47bb750c
    • Alexander Nozdrin's avatar
      Merge from mysql-5.0-bugteam. · 412f1141
      Alexander Nozdrin authored
      412f1141
    • Alexander Nozdrin's avatar
    • Alexander Nozdrin's avatar
    • Ramil Kalimullin's avatar
      Manual-merge from mysql-5.1-bugteam. · 65116d34
      Ramil Kalimullin authored
      65116d34
    • Guilhem Bichot's avatar
      Fix for Bug#56138 "valgrind errors about overlapping memory when double-assigning same variable", · 96b04049
      Guilhem Bichot authored
      and related small fixes.
      
      mysql-test/t/user_var.test:
        test for bug
      sql/field_conv.cc:
        From the C standard, memcpy() has undefined behaviour if to->ptr==from->ptr
      sql/item_func.cc:
        In the case of BUG#56138, entry->value==ptr in which case memcpy()
        has undefined results per the C standard.
      sql/sql_select.cc:
        Work around a bug in old gcc
      96b04049
  8. 20 Nov, 2010 1 commit
  9. 18 Nov, 2010 1 commit
    • Georgi Kodinov's avatar
      Bug #50021: Windows standard configuration files are showing Linux · 05c9acaa
      Georgi Kodinov authored
       options/settings
       
       1. Changed the default value for socket on Windows to the windows
       default
       2. Removed hard-coded trailing slashes from innodb_data_home_dir
       and innodb_log_group_name_dir.
       3. Added extra backslashes to the innodb directory example
       4. Made the tempdir platform "dependent"
       5. Fixed the comments in the .ini files
       6. Removed the tmpdir from the templates and the scripts
      05c9acaa
  10. 19 Nov, 2010 1 commit
  11. 18 Nov, 2010 6 commits
  12. 17 Nov, 2010 3 commits
    • Bjorn Munch's avatar
      Bug #58257 mysqltest: in if(), ! $var with space is always false · 32ea0708
      Bjorn Munch authored
      Evaluation would start with the space and thus ignore the $
      Added while() to skip past white space
      32ea0708
    • Davi Arnaut's avatar
      Bug#57994: Compiler flag change build error : my_redel.c · c3246242
      Davi Arnaut authored
      Use __builtin_stpcpy only if the system supports stpcpy.
      This is necessary as in some cases a call to stpcpy will
      be emitted if the built-in can not optimized.
      
      include/m_string.h:
        The expansion of stpcpy (in glibc) causes warnings if the
        return value of strmov is not being used. Since stpcpy is
        a GNU extension and the expansion ends up using a built-in
        provided by GCC, use the compiler provided built-in directly
        when possible. Nonetheless, the C library must have stpcpy
        as a call be emitted if the built-in can not optimized.
      c3246242
    • Mattias Jonsson's avatar
      post-push fix, backported --replace_result patch · 21bc09c2
      Mattias Jonsson authored
      for --list_files in mysqltest.
      
      client/mysqltest.cc:
        Backported --replace_result for --list_files.
      mysql-test/r/mysqltest.result:
        updated test.
      mysql-test/t/mysqltest.test:
        added test for replace_result on list_files.
      21bc09c2
  13. 15 Nov, 2010 3 commits