1. 13 Feb, 2008 1 commit
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 91123903
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      BitKeeper/deleted/.del-bdb.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/type_binary.result:
        Auto merged
      mysql-test/r/type_set.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/mysqld.cc:
        Null merge.
      mysql-test/include/mix1.inc:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/r/range.result:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      sql/handler.cc:
        Manual merge.
      91123903
  2. 12 Feb, 2008 5 commits
    • unknown's avatar
      Merge mbp:src/opt/bug33389/my51-bug25162 · 00b17696
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      00b17696
    • unknown's avatar
      Merge mbp:src/opt/bug33389/my50-bug25162 · c6610b57
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      c6610b57
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 8fe44ccb
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      8fe44ccb
    • unknown's avatar
      Merge mbp.:/Users/kaa/src/opt/bug33389/my50-bug25162 · 9b483c31
      unknown authored
      into  mbp.:/Users/kaa/src/opt/bug33389/my51-bug25162
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Manual merge.
      sql/item.cc:
        Manual merge.
      9b483c31
    • unknown's avatar
      Fix for bug #33389: Selecting from a view into a table from within SP · d5092fa9
      unknown authored
                          or trigger crashes server
      
      Under some circumstances a combination of VIEWs, subselects with outer
      references and PS/SP/triggers could lead to use of uninitialized memory
      and server crash as a result.
      
      Fixed by changing the code in Item_field::fix_fields() so that in cases
      when the field is a VIEW reference, we first check whether the field
      is also an outer reference, and mark it appropriately before returning.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #33389.
      mysql-test/t/view.test:
        Added a test case for bug #33389.
      sql/item.cc:
        In cases when in Item_field::fix_fields() from_field is a view reference,
        do not return too early, i.e. before marking the reference as an outer
        one when needed.
      d5092fa9
  3. 11 Feb, 2008 2 commits
  4. 10 Feb, 2008 9 commits
  5. 08 Feb, 2008 2 commits
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 60ca0e34
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      60ca0e34
    • unknown's avatar
      Fixed bug#15409: Columns with 64-element SET may not be updated with integers. · 213b4dcd
      unknown authored
      SET column storing procedure has been modified to be 64bit-clean.
      
      
      mysql-test/r/type_set.result:
        Added test case for bug#15409.
      mysql-test/t/type_set.test:
        Added test case for bug#15409.
      sql/field.cc:
        Fixed bug#15409.
        The Field_set::store(longlong nr,...) method incompletely
        calculates a bit mask for the comparison with a given number:
        if that number is greater than 0x7F00 0000 0000 0000 (LONGLONG_MAX),
        it uses zero bit mask instead of 0xFFFF FFFF FFFF FFFF (ULONGLONG_MAX).
        
        Incomplete expression has been replaced with a set_bits macro call.
      213b4dcd
  6. 07 Feb, 2008 7 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bd0a8e6c
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug27732
      
      
      bd0a8e6c
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt-34223 · 1027a2a6
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      1027a2a6
    • unknown's avatar
      innodb_mysql.test, variables.result, variables.test, innodb_mysql.result: · a4eaf17c
      unknown authored
        Minor post-fix for bug#34223.
      
      
      mysql-test/r/innodb_mysql.result:
        Minor post-fix for bug#34223.
      mysql-test/r/variables.result:
        Minor post-fix for bug#34223.
      mysql-test/t/innodb_mysql.test:
        Minor post-fix for bug#34223.
      mysql-test/t/variables.test:
        Minor post-fix for bug#34223.
      a4eaf17c
    • unknown's avatar
      BUG#27732 "Possible memory leak with index_merge" · a1e83978
      unknown authored
      The bug was that handler::clone/handler::ha_open() call caused allocation of 
      cloned_copy->ref on the handler->table->mem_root. The allocated memory could not 
      be reclaimed until the table is flushed, so it was possible to exhaust memory by 
      repeatedly running index_merge queries without doing table flushes.  
      
      The fix:
      - make handler::clone() allocate new_handler->ref on the passed mem_root 
      - make handler::ha_open() not allocate this->ref if it has already been allocated
      There is no testcase as it is not possible to check small leaks from testsuite.
      
      
      sql/handler.cc:
        BUG#27732 "Possible memory leak with index_merge"
        - make handler::clone() allocate new_handler->ref on the passed mem_root 
        - make handler::ha_open() not allocate this->ref if it has already been allocated
      a1e83978
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt-34223 · 65dfdcdf
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      65dfdcdf
    • unknown's avatar
      bdb.result: · 6cdd9d5c
      unknown authored
        Minor post-fix for bug#30059.
      
      
      mysql-test/r/bdb.result:
        Minor post-fix for bug#30059.
      6cdd9d5c
    • unknown's avatar
      Fixed bug#34223: Failure on assignment to my_innodb_autoextend_increment · 5cf3f53e
      unknown authored
      and my_innodb_commit_concurrency global variables.
      
      Type of the my_innodb_autoextend_increment and the
      my_innodb_commit_concurrency variables has been changed to
      GET_ULONG.
      
      
      
      mysql-test/r/variables.result:
        Added test case for bug#34223.
      mysql-test/t/variables.test:
        Added test case for bug#34223.
      sql/mysqld.cc:
        Fixed bug#34223.
        Last update of the getopt_ull_limit_value function introduced
        a sanity check for a variable type (only GET_UINT or GET_ULONG
        are valid types).
        However, my_innodb_autoextend_increment and
        my_innodb_commit_concurrency are declared as GET_LONG.
        Call stack is: 
                sys_var_long_ptr_global::update()
                fix_unsigned()
                getopt_ull_limit_value()
        
        Type of the my_innodb_autoextend_increment and the
        my_innodb_commit_concurrency variables has been changed to
        GET_ULONG.
      5cf3f53e
  7. 06 Feb, 2008 1 commit
    • unknown's avatar
      Fixed bug#30059. · 3891d436
      unknown authored
      Server handles truncation for assignment of too-long values
      into CHAR/VARCHAR/TEXT columns in a different ways when the
      truncated characters are spaces:
      1. CHAR(N) columns silently ignore end-space truncation;
      2. TEXT columns post a truncation warning/error in the
         non-strict/strict mode.
      3. VARCHAR columns always post a truncation note in
         any mode.
      
      Space truncation processing has been synchronised over
      CHAR/VARCHAR/TEXT columns: current behavior of VARCHAR
      columns has been propagated as standard.
      
      Binary-encoded string/BLOB columns are not affected.
      
      
      mysql-test/r/heap.result:
        Updated test case for bug#30059.
      mysql-test/r/innodb.result:
        Updated test case for bug#30059.
      mysql-test/r/myisam.result:
        Updated test case for bug#30059.
      mysql-test/r/strict.result:
        Updated test case for bug#30059.
      mysql-test/r/type_binary.result:
        Updated test case for bug#30059.
      mysql-test/r/warnings.result:
        Added test case for bug#30059.
      mysql-test/t/warnings.test:
        Added test case for bug#30059.
      sql/field.cc:
        Fixed bug#30059.
        The report_data_too_long function was replaced with the
        Field_longstr::report_if_important_data method.
        
        The Field_string::store and the Field_blob::store
        methods was synchronized with the Field_varstring::store
        method.
        Changes:
        1. to CHAR(N): posting of space truncation note has been added
           in both (strict and non-strict) modes;
        2. to BLOBs: a check for space truncation has been added,
           a warning in the non-strict mode and an error message in
           the strict mode have been replaced with a truncation note.
        
        Similar parts of Field_string::store, Field_blob::store and
        Field_varstring::store have been moved to the
        Field_longstr::report_if_important_data method.
      sql/field.h:
        Fixed bug#30059.
        The Field_longstr::report_if_important_data method has been declared.
      3891d436
  8. 05 Feb, 2008 1 commit
  9. 01 Feb, 2008 4 commits
    • unknown's avatar
      Merge mbp.local:/Users/kaa/src/opt/bug25162/my51-bug25162 · e0f4fb72
      unknown authored
      into  mbp.local:/Users/kaa/src/opt/mysql-5.1-opt
      
      
      e0f4fb72
    • unknown's avatar
      Merge mbp.local:/Users/kaa/src/opt/bug25162/my50-bug25162 · 1919d238
      unknown authored
      into  mbp.local:/Users/kaa/src/opt/mysql-5.0-opt
      
      
      1919d238
    • unknown's avatar
      Merge mbp.local:/Users/kaa/src/opt/bug25162/my50-bug25162 · 78e19d42
      unknown authored
      into  mbp.local:/Users/kaa/src/opt/bug25162/my51-bug25162
      
      
      mysql-test/t/create.test:
        Auto merged
      sql/sql_yacc.yy:
        Null merge.
      mysql-test/r/create.result:
        Manual merge.
      78e19d42
    • unknown's avatar
      Fix for bug #25162: Backing up DB from 5.1 adds 'USING BTREE' to KEYs · 4d794c23
      unknown authored
                          on table creates
      
      The problem was in incompatible syntax for key definition in CREATE
      TABLE.
      
      5.0 supports only the following syntax for key definition (see "CREATE
      TABLE syntax" in the manual):
      
      {INDEX|KEY} [index_name] [index_type] (index_col_name,...)
      
      While 5.1 parser supports the above syntax, the "preferred" syntax was
      changed to:
      
      {INDEX|KEY} [index_name] (index_col_name,...) [index_type]
      
      The above syntax is used in 5.1 for the SHOW CREATE TABLE output, which
      led to dumps generated by 5.1 being incompatible with 5.0.
      
      Fixed by changing the parser in 5.0 to support both 5.0 and 5.1 syntax
      for key definition.
      
      
      mysql-test/r/create.result:
        Added a test case for bug #25162.
      mysql-test/t/create.test:
        Added a test case for bug #25162.
      sql/sql_yacc.yy:
        Changed the parser to support both 5.0 and 5.1 syntax for index type
        specification in CREATE TABLE.
      4d794c23
  10. 31 Jan, 2008 3 commits
    • unknown's avatar
      Bug#30787: Stored function ignores user defined alias. · 754c3f51
      unknown authored
      Simple subselects are pulled into upper selects. This operation substitutes the
      pulled subselect for the first item from the select list of the subselect.
      If an alias is defined for a subselect it is inherited by the replacement item.
      As this is done after fix_fields phase this alias isn't showed if the
      replacement item is a stored function. This happens because the Item_func_sp::make_field
      function makes send field from its result_field and ignores the defined alias.
      
      Now when an alias is defined the Item_func_sp::make_field function sets it for
      the returned field.
      
      
      mysql-test/t/sp.test:
        Added a test case for the bug#30787: Stored function ignores user defined alias.
      mysql-test/r/sp.result:
        Added a test case for the bug#30787: Stored function ignores user defined alias.
      sql/item_func.cc:
        Bug#30787: Stored function ignores user defined alias.
        Now when an alias is defined the Item_func_sp::make_field function sets it for
        the returned field.
      754c3f51
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 5d7b70bb
      unknown authored
      into  mysql.com:/home/hf/work/25426/my51-25426
      
      
      5d7b70bb
    • unknown's avatar
      Bug #25426 Prefix index on DECIMAL column causes warning. · 53086d89
      unknown authored
      Error message modified to be consistent with the manual.
      
      
      mysql-test/r/alter_table.result:
        Bug #25426 Prefix index on DECIMAL column causes warning.
        
        test result fixed
      sql/share/errmsg.txt:
        Bug #25426 Prefix index on DECIMAL column causes warning.
        
        error messages modified
      53086d89
  11. 30 Jan, 2008 1 commit
  12. 27 Jan, 2008 1 commit
    • unknown's avatar
      Fixed bug #33833. · e30a0dda
      unknown authored
      Two disjuncts containing equalities of the form key=const1 and key=const2 can
      be merged into one if const1 is equal to const2. To check it the common 
      collation of the constants were used rather than the collation of the field key.
      For example when the default collation of the constants was cases insensitive
      while the collation of the field was case sensitive, then two or-ed equality 
      predicates key='b' and key='B' incorrectly were merged into one f='b'. As a 
      result ref access was used instead of range access and wrong result sets were 
      returned in many cases. 
      Fixed the problem by comparing constant in the or-ed predicate with collation of
      the key field.
      
      
      mysql-test/r/range.result:
        Added a test case for bug #33833.
      mysql-test/t/range.test:
        Added a test case for bug #33833.
      sql/item.cc:
        Fixed bug #33833.
        Added the method eq_by_collation that compares two items almost as 
        the method Item::eq, but it rather enforces a given collation for
        the comparison.
      sql/item.h:
        Fixed bug #33833.
        Added the method eq_by_collation that compares two items almost as 
        the method Item::eq, but it rather enforces a given collation for
        the comparison.
      e30a0dda
  13. 25 Jan, 2008 1 commit
    • unknown's avatar
      Bug #31524: One table one row select on NDB cause optimizer to · 7b71c46f
      unknown authored
        require SQL_BIG_SELECTS=1
      
      There was a previous test that leaves a non-default (small) max_join_size.
      Fixed by re-setting the max_join_size to default when the test is over.
      
      
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Bug #31524: side effects of previous testsuites fixed
      mysql-test/suite/rpl/r/rpl_row_charset.result:
        Bug #31524: side effects of previous testsuites fixed
      mysql-test/suite/rpl/r/rpl_row_charset_innodb.result:
        Bug #31524: side effects of previous testsuites fixed
      mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
        Bug #31524: side effects of previous testsuites fixed
      7b71c46f
  14. 24 Jan, 2008 1 commit
  15. 20 Jan, 2008 1 commit