An error occurred fetching the project authors.
  1. 11 Dec, 2007 1 commit
    • unknown's avatar
      Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 · 8870d015
      unknown authored
      There were two problems when inferring the correct field types resulting from
      UNION queries.
      - If the type is NULL for all corresponding fields in the UNION, the resulting 
        type would be NULL, while the type is BINARY(0) if there is just a single 
        SELECT NULL.
      - If one SELECT in the UNION uses a subselect, a temporary table is created
        to represent the subselect, and the result type defaults to a STRING type,
        hiding the fact that the type was unknown(just a NULL value).
      Fixed by remembering whenever a field was created from a NULL value and pass
      type NULL to the type coercion if that is the case, and creating a string field
      as result of UNION only if the type would otherwise be NULL.
      
      
      mysql-test/r/union.result:
        Bug#32848: Test result
      mysql-test/t/union.test:
        Bug#32848: Test case
      sql/field.cc:
        Bug#32848: Initialization of new field
      sql/field.h:
        Bug#32848: New member to record when a field was created from a NULL value.
      sql/item.cc:
        Bug#32848: 
        A field created from a NULL value will submit NULL as type to the 
        type coercion procedure.
        If Item_type_holder has not inferred the correct type after processing all
        SELECTs in a UNION, a string field is created.
      sql/sql_select.cc:
        Bug#32848: Recording when a field is created from a NULL value.
      8870d015
  2. 22 Mar, 2007 1 commit
    • unknown's avatar
      Bug#24791: Union with AVG-groups generates wrong results · 2e72abed
      unknown authored
      Patch appled after doing a pull from the team tree. Additional tests had to be
      fixed
      
      
      mysql-test/r/union.result:
        Bug 24791
        
        The tests for temporary tables have been fixed. Since the call to 
        display_length(Item) was removed from the constructor for Item_type_holder, items 
        in temporary tables keep the original values of the items, rather than the magic
        numbers supplied by display_length.
      2e72abed
  3. 21 Mar, 2007 1 commit
    • unknown's avatar
      Bug#23345: Wrongly allowed INTO in a non-last select of a UNION. · 685219e1
      unknown authored
      INTO clause can be specified only for the last select of a UNION and it
      receives the result of the whole query. But it was wrongly allowed in
      non-last selects of a UNION which leads to a confusing query result.
      
      Now INTO allowed only in the last select of a UNION.
      
      
      mysql-test/t/union.test:
        Added a test case for the bug#23345: Wrongly allowed INTO in a non-last select of a UNION.
      mysql-test/r/union.result:
        Added a test case for the bug#23345: Wrongly allowed INTO in a non-last select of a UNION.
      sql/sql_yacc.yy:
        Bug#23345: Wrongly allowed INTO in a non-last select of a UNION.
        Now INTO allowed only in the last select of a UNION.
      685219e1
  4. 09 Mar, 2007 2 commits
    • unknown's avatar
      Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 9cc553a2
      unknown authored
      away.
      
      Additional fix for bug#22331. Now Item_field prints its value in the case of
      the const field.
      
      
      mysql-test/r/varbinary.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/union.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/subselect.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_test.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/having.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_regexp.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_str.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_default.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/explain.result:
        Corrected test case after fix for bug#22331.
      sql/sql_union.cc:
        Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
        away.
        Cleanup of the SELECT_LEX::order_list list.
      sql/item.h:
        Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
        away.
        Added the print() member function to the Item_field class.
      sql/item.cc:
        Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
        away.
        Added the print() member function to the Item_field class.
      9cc553a2
    • unknown's avatar
      Fixed bug #26661: crash when order by clause in a union · d738e0ea
      unknown authored
      construct references invalid name.
      Derived tables currently cannot use outer references.
      Thus there is no outer context for them.
      The 4.1 code takes this fact into account while the 
      Item_field::fix_outer_field code of 5.0 lost the check that blocks
      any attempts to resolve names in outer context for derived tables.
      
      
      mysql-test/r/union.result:
        Added a test case for bug #26661.
      mysql-test/t/union.test:
        Added a test case for bug #26661.
      sql/item.cc:
        Fixed bug #26661.
        Derived tables currently cannot use outer references.
        Thus there is no outer context for them.
        The 4.1 code takes this fact into account while the 
        Item_field::fix_outer_field code of 5.0 lost the check that blocks
        any attempts to resolve names in outer context for derived tables.
      d738e0ea
  5. 12 Oct, 2006 1 commit
    • unknown's avatar
      Bug #19764: SHOW commands end up in the slow log as table scans · 02e828e2
      unknown authored
      Do not consider SHOW commands slow queries, just because they don't use proper indexes.
      
      This bug fix is not needed in 5.1, and the code changes will be null merged.  However, the test cases will be propogated up to 5.1.
      
      
      mysql-test/t/show_check-master.opt:
        Rename: BitKeeper/deleted/.del-show_check-master.opt -> mysql-test/t/show_check-master.opt
      mysql-test/r/ps.result:
        Add test case for bug 19764
      mysql-test/r/show_check.result:
        Add test case for bug 19764
      mysql-test/r/union.result:
        Adjust test case results based on bug #19764 changes
      mysql-test/t/ps.test:
        Add test case for bug 19764
      mysql-test/t/show_check.test:
        Add test case for bug 19764
      sql/sql_parse.cc:
        Do not log SHOW commands as slow queries just because they don't use indexes.
      sql/sql_prepare.cc:
        Save stmt_backup.lex->orig_sql_command for use in log_slow_statement()
      mysql-test/t/ps-master.opt:
        Add log-slow-queries and --log-queries-not-using indexes, to test bug #19764
      02e828e2
  6. 05 Sep, 2006 1 commit
  7. 03 Aug, 2006 1 commit
  8. 21 Jul, 2006 2 commits
    • unknown's avatar
      Fixed bug#12185: Data type aggregation may produce wrong result · a05809b6
      unknown authored
      The Item::tmp_table_field_from_field_type() function creates Field_datetime
      object instead of Field_timestamp object for timestamp field thus always
      changing data type is a tmp table is used.
      
      The Field_blob object constructor which is used in the 
      Item::tmp_table_field_from_field_type() is always setting packlength field of
      newly created blob to 4. This leads to changing fields data type for example
      from the blob to the longblob if a temporary table is used.
      
      The Item::make_string_field() function always converts Field_string objects 
      to Field_varstring objects. This leads to changing data type from the 
      char/binary to varchar/varbinary.
      
      Added appropriate Field_timestamp object constructor for using in the 
      Item::tmp_table_field_from_field_type() function.
      
      Added Field_blob object constructor which sets pack length according to
      max_length argument.
      
      The Item::tmp_table_field_from_field_type() function now creates
      Field_timestamp object for a timestamp field.
      
      The Item_type_holder::display_length() now returns correct NULL length NULL
      length. 
      
      The Item::make_string_field() function now doesn't change Field_string to
      Field_varstring in the case of Item_type_holder. 
      
      The Item::tmp_table_field_from_field_type() function now uses the Field_blob
      constructor which sets packlength according to max_length.
      
      
      mysql-test/t/union.test:
        Added test case for bug#12185: Data type aggregation may produce wrong result
        Corrected test case after fix for bug#12185
      mysql-test/t/innodb.test:
        Corrected test case after fix for bug#12185
      mysql-test/r/union.result:
        Added test case for bug#12185: Data type aggregation may produce wrong result
         Corrected test case after fix for bug#12185
      mysql-test/r/innodb.result:
        Corrected test case after fix for bug#12185
      mysql-test/r/create.result:
        Corrected the test case after fixing bug#12185
      sql/field.h:
        Fixed bug#12185: Data type aggregation may produce wrong result
        Added Field_blob object constructor which sets packlength according to
        max_length argument.
      sql/item.cc:
        Fixed bug#12185: Data type aggregation may produce wrong result
        The Item::make_string_field() function now doesn't change Field_string to
        Field_varstring in the case of Item_type_holder.
        The Item::tmp_table_field_from_field_type() function now creates
        Field_timestamp object for a timestamp field.
        The Item::tmp_table_field_from_field_type() function now uses the Field_blob
        constructor which sets packlength according to max_length.
        The Item_type_holder::display_length() now returns correct NULL length NULL
        length.
      sql/field.cc:
        Fixed bug#12185: Data type aggregation may produce wrong result
        Added appropriate Field_timestamp object constructor for using in the 
        Item::tmp_table_field_from_field_type() function.
      a05809b6
    • unknown's avatar
      Bug #16881: password() and union select · 7d77a065
      unknown authored
        This was only demonstrated by the use of PASSWORD(), it was not related to
        that function at all. The calculation of the size of a field in the results
        of a UNION did not take into account the possible growth of a string field
        when being converted to the aggregated character set.
      
      
      mysql-test/r/union.result:
        Add new results
      mysql-test/t/union.test:
        Add new regression test
      sql/item.cc:
        Fix calculation of max_length when figuring out the type of a column in
        a UNION. It needs to take into account any expansion of field size due to
        charset conversions.
      7d77a065
  9. 15 Jun, 2006 1 commit
    • unknown's avatar
      Fixed bug#18175: The nest_level counter wasn't decremented for union parts which · ee46c5fb
      unknown authored
      resulted in a wrong error message.
      
      The nest_level counter indicates the depth of nesting for a subselect. It is
      needed to properly resolve aggregate functions in nested subselects. Obviously 
      it shouldn't be incremented for UNION parts because they have the same level of
      nesting. This counter was incremented by 1 in the mysql_new_select() function
      for any new select and wasn't decremented for UNION parts. This resulted in
      wrongly reported error messages.
      
      Now the nest_level counter is decremented by 1 for any union part.
      
      
      mysql-test/t/union.test:
        Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
        resulted in a wrong error message.
      mysql-test/r/union.result:
        Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
        resulted in a wrong error message.
      sql/sql_yacc.yy:
        Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
        resulted in a wrong error message.
        Now the nest_level counter is decremented by 1 for any union part.
      ee46c5fb
  10. 01 Mar, 2006 1 commit
    • unknown's avatar
      Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) · d00c37c2
      unknown authored
      union.result, union.test:
        Adding test case.
      item.cc:
        Allow safe character set conversion in UNION
        - string constant to column's charset
        - to unicode
        Thus, UNION now works the same with CONCAT (and other string functions)
        in respect of aggregating arguments with different character sets.
      
      
      sql/item.cc:
        Allow character set conversion in UNION
        - string to column's charset
        - to unicode
        Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
      mysql-test/t/union.test:
        Adding test case.
      mysql-test/r/union.result:
        Adding test case.
      d00c37c2
  11. 30 Nov, 2005 1 commit
    • unknown's avatar
      Fix union.result · b8fdba58
      unknown authored
      mysql-test/r/union.result:
        Fix order of test results
      b8fdba58
  12. 29 Oct, 2005 1 commit
  13. 27 Sep, 2005 1 commit
  14. 23 Sep, 2005 1 commit
    • unknown's avatar
      Merge from 4.1 to 5.0 · 34666c3b
      unknown authored
      mysql-test/r/loaddata.result:
        Add drop tablea after test case
      mysql-test/r/type_decimal.result:
        Update warnings
      mysql-test/r/union.result:
        Miss in merge
      mysql-test/t/loaddata.test:
        Add drop table after test case
      sql/opt_sum.cc:
        Add missing }
      sql/sql_load.cc:
        Manual merge
      34666c3b
  15. 21 Sep, 2005 1 commit
    • unknown's avatar
      a fix (bug #7589: Decimal types are ignored when updating data from another column). · ecbc0dcb
      unknown authored
      mysql-test/r/union.result:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        removed wrong test result (see #13372)
      mysql-test/t/union.test:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        removed wrong test result (see #13372)
      sql/field_conv.cc:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        use memcpy() only for identical decimals.
      ecbc0dcb
  16. 12 Aug, 2005 1 commit
    • unknown's avatar
      Implementation of WL#2486 - · bcc00c1f
      unknown authored
      "Process NATURAL and USING joins according to SQL:2003".
      
      * Some of the main problems fixed by the patch:
        - in "select *" queries the * expanded correctly according to
          ANSI for arbitrary natural/using joins
        - natural/using joins are correctly transformed into JOIN ... ON
          for any number/nesting of the joins.
        - column references are correctly resolved against natural joins
          of any nesting and combined with arbitrary other joins.
      
      * This patch also contains a fix for name resolution of items
        inside the ON condition of JOIN ... ON - in this case items must
        be resolved only against the JOIN operands. To support such
        'local' name resolution, the patch introduces a stack of
        name resolution contexts used at parse time.
      
      NOTICE:
      - This patch is not complete in the sense that
        - there are 2 test cases that still do not pass -
          one in join.test, one in select.test. Both are marked
          with a comment "TODO: WL#2486".
        - it does not include a new test specific for the task
      
      
      mysql-test/include/ps_query.inc:
        Adjusted according to standard NATURAL/USING join semantics.,
      mysql-test/r/bdb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/derived.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/errors.result:
        The column as a whole cannot be resolved, so different error message.
      mysql-test/r/fulltext.result:
        Adjusted according to standard JOIN ... ON semantics =>
        the ON condition can refer only to the join operands.
      mysql-test/r/fulltext_order_by.result:
        More detailed error message.
      mysql-test/r/innodb.result:
        Adjusted according to standard NATURAL/USING join semantics.
        This test doesn't pass completetly yet!
      mysql-test/r/insert_select.result:
        More detailed error message.
      mysql-test/r/join.result:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one test case that still fails, and it is
        commeted out and marked with WL#2486 in the test file.
      mysql-test/r/join_crash.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/join_nested.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/join_outer.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/multi_update.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/null_key.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/order_by.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_2myisam.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_3innodb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_4heap.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_5merge.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_6bdb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_7ndb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/select.result:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one failing test case which is commented with
        WL#2486 in the test file.
      mysql-test/r/subselect.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/type_ranges.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/union.result:
        More detailed error message.
      mysql-test/t/bdb.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/errors.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/fulltext.test:
        Adjusted according to standard JOIN ... ON semantics =>
        the ON condition can refer only to the join operands.
      mysql-test/t/fulltext_order_by.test:
        More detailed error message.
      mysql-test/t/innodb.test:
        Adjusted according to standard NATURAL/USING join semantics.
        This test doesn't pass completetly yet!
      mysql-test/t/insert_select.test:
        More detailed error message.
      mysql-test/t/join.test:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one test case that still fails, and it is
        commeted out and marked with WL#2486 in the test file.
      mysql-test/t/join_crash.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/join_nested.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/join_outer.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/null_key.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/order_by.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/select.test:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one test case that still fails, and it is
        commeted out and marked with WL#2486 in the test file.
      mysql-test/t/subselect.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/type_ranges.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/union.test:
        More detailed error message.
      sql/item.cc:
        - extra parameter to find_field_in_tables
        - find_field_in_real_table renamed to find_field_in_table
        - fixed comments/typos
      sql/item.h:
        - added [first | last]_name_resolution_table to class
          Name_resolution_context
        - commented old code
        - standardized formatting
      sql/mysql_priv.h:
        - refactored the find_field_in_XXX procedures,
        - added a new procedure for natural join table references,
        - renamed the find_field_in_XXX procedures to clearer names
      sql/sp.cc:
        - pass the top-most list of the FROM clause to setup_tables
        - extra parameter to find_field_in_tables
      sql/sql_acl.cc:
        - renamed find_field_in_table => find_field_in_table_ref
        - extra parameter to find_field_in_table_ref
        - commented old code
      sql/sql_base.cc:
        This file contains the core of the implementation of the processing
        of NATURAL/USING joins (WL#2486).
        - added many comments to old code
        - refactored the group of find_field_in_XXX procedures, and added a
          new procedure for natural joins. There is one find_field_in_XXX procedure
          per each type of table reference (stored table, merge view, or natural
          join); one meta-procedure that selects the correct one depeneding on the
          table reference; and one procedure that goes over a list of table
          referenes.
        - NATURAL/USING joins are processed through the procedures:
            mark_common_columns, store_natural_using_join_columns,
            store_top_level_join_columns, setup_natural_join_row_types.
          The entry point to processing NATURAL/USING joins is the
          procedure 'setup_natural_join_row_types'.
        - Replaced the specialized Field_iterator_XXX iterators with one
          generic iterator over the fields of a table reference.
        - Simplified 'insert_fields' and 'setup_conds' due to encapsulation of
          the processing of natural joins in a separate set of procedures.
      sql/sql_class.h:
        - Commented old code.
      sql/sql_delete.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_help.cc:
        - pass the end name resolution table to find_field_in_tables
        - adjust the list of tables for name resolution
      sql/sql_insert.cc:
        - Changed the code that saves and restores the current context to
          support the list of tables for name resolution -
          context->first_name_resolution_table, and
          table_list->next_name_resolution_table.
          Needed to support an ugly trick to resolve inserted columns only in
          the first table.
        - Added Name_resolution_context::[first | last]_name_resolution_table.
        - Commented old code
      sql/sql_lex.cc:
        - set select_lex.parent_lex correctly
        - set correct state of the current name resolution context
      sql/sql_lex.h:
        - Added a stack of name resolution contexts to support local
          contexts for JOIN ... ON conditions.
        - Commented old code.
      sql/sql_load.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_olap.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_parse.cc:
        - correctly set SELECT_LEX::parent_lex
        - set the first table of the current name resoltion context
        - added support for NATURAL/USING joins
        - commented old code
      sql/sql_select.cc:
        - Pass the FROM clause to setup_tables.
        - Pass the end table to find_field_in_tables
        - Improved comments
      sql/sql_show.cc:
        - Set SELECT_LEX::parent_lex.
      sql/sql_update.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_yacc.yy:
        - Added support for a stack of name resolution contexts needed to
          implement name resolution for JOIN ... ON. A context is pushed
          for each new JOIN ... ON, and popped afterwards.
        - Added support for NATURAL/USING joins.
      sql/table.cc:
        - Added new class Natural_join_column to hide the heterogeneous
          representation of column references for stored tables and for
          views.
        - Added a new list TABLE_LIST::next_name_resolution_table to
          support name resolution with NATURAL/USING joins. Also added
          other members to TABLE_LIST to support NATURAL/USING joins.
        - Added a generic iterator over the fields of table references
          of various types - class Field_iterator_table_ref
      sql/table.h:
        - Added new class Natural_join_column to hide the heterogeneous
          representation of column references for stored tables and for
          views.
        - Added a new list TABLE_LIST::next_name_resolution_table to
          support name resolution with NATURAL/USING joins. Also added
          other members to TABLE_LIST to support NATURAL/USING joins.
        - Added a generic iterator over the fields of table references
          of various types - class Field_iterator_table_ref
      tests/mysql_client_test.c:
        Adjusted according to standard NATURAL JOIN syntax.
      bcc00c1f
  17. 26 May, 2005 2 commits
    • unknown's avatar
      Fix broken test case (after merge) · 8dc53bc3
      unknown authored
      mysql-test/r/union.result:
        Convert back the latin1 characters that where accidently changed during last merge
      mysql-test/t/union.test:
        Convert back the latin1 characters that where accidently changed during last merge
      8dc53bc3
    • unknown's avatar
      fixed problem with long string results of expressions in UNIONS (BUG#10025) · 34514477
      unknown authored
      mysql-test/r/union.result:
        test for Bug #10025
      mysql-test/t/union.test:
        test for Bug #10025
      sql/item.cc:
        set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)
      34514477
  18. 05 May, 2005 1 commit
    • unknown's avatar
      Tests and results fixed with last precision/decimal related modifications · e1c6c977
      unknown authored
      mysql-test/r/case.result:
        test result fixed
      mysql-test/r/create.result:
        test result fixed
      mysql-test/r/distinct.result:
        test result fixed
      mysql-test/r/func_group.result:
        test result fixed
      mysql-test/r/func_op.result:
        test result fixed
      mysql-test/r/group_by.result:
        test result fixed
      mysql-test/r/metadata.result:
        test result fixed
      mysql-test/r/olap.result:
        test result fixed
      mysql-test/r/ps_2myisam.result:
        test result fixed
      mysql-test/r/ps_3innodb.result:
        test result fixed
      mysql-test/r/ps_4heap.result:
        test result fixed
      mysql-test/r/ps_5merge.result:
        test result fixed
      mysql-test/r/ps_6bdb.result:
        test result fixed
      mysql-test/r/ps_7ndb.result:
        test result fixed
      mysql-test/r/select.result:
        test result fixed
      mysql-test/r/sp.result:
        test result fixed
      mysql-test/r/type_decimal.result:
        test result fixed
      mysql-test/r/type_newdecimal.result:
        test result fixed
      mysql-test/r/union.result:
        test result fixed
      mysql-test/r/variables.result:
        test result fixed
      mysql-test/t/func_group.test:
        test modified
      mysql-test/t/olap.test:
        test modified
      mysql-test/t/type_decimal.test:
        test modified
      e1c6c977
  19. 26 Apr, 2005 1 commit
    • unknown's avatar
      union.result: · 75075381
      unknown authored
        Results for the above test case
      union.test:
        A test case for bug #10032 involving UNION's and ORDER BY clause
      sql_yacc.yy:
        Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
      
      
      sql/sql_yacc.yy:
        Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
      mysql-test/t/union.test:
        A test case for bug #10032 involving UNION's and ORDER BY clause
      mysql-test/r/union.result:
        Results for the above test case
      75075381
  20. 10 Apr, 2005 1 commit
    • unknown's avatar
      ctype_collate.result, ctype_collate.test, union.result, union.test: · 37d2d7db
      unknown authored
        fixing tests accordingly
      item.cc:
        Allow mixing non-binary collation and binary collation
        even if coercibility is the same. 
        For easier 4.0 -> 4.1 migrating.
      
      
      sql/item.cc:
        Allow mixing non-binary collation and binary collation
        even if coercibility is the same. 
        For easier 4.0 -> 4.1 migrating.
      mysql-test/t/union.test:
        fixing tests accordingly
      mysql-test/r/union.result:
        fixing tests accordingly
      mysql-test/t/ctype_collate.test:
        fixing tests accordingly
      mysql-test/r/ctype_collate.result:
        fixing tests accordingly
      37d2d7db
  21. 04 Apr, 2005 1 commit
    • unknown's avatar
      Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly · 7c85077f
      unknown authored
      Fix that mysql.proc works with new VARCHAR fields
      Give warnings for wrong zero dates
      
      
      configure.in:
        Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
      mysql-test/r/func_time.result:
        New warnings
      mysql-test/r/row.result:
        Moved code around to get things to work with --ps-protocol
        Note that one on warning disappered, but it should appear again when bug #9600 is fixed
      mysql-test/r/strict.result:
        enabled more tests
        Added more tests
      mysql-test/r/union.result:
        Test that UNION generates correct row format
      mysql-test/t/row.test:
        Moved test to get things to work with --ps-protocol
      mysql-test/t/strict.test:
        enabled more tests
        Added more tests
      mysql-test/t/union.test:
        Test that UNION generates correct row format
      sql/item.cc:
        Removed compiler warning
        Simple cleanup
      sql/sp.cc:
        Fix that mysql.proc works with new VARCHAR fields
      sql/time.cc:
        Give warnings for wrong zero dates
      tests/mysql_client_test.c:
        More startup information
      7c85077f
  22. 31 Mar, 2005 1 commit
    • unknown's avatar
      postmerge 4.1->5.0 fixes · 9d7d3fb3
      unknown authored
      mysql-test/r/group_by.result:
        result change
      mysql-test/r/union.result:
        result change
      mysql-test/r/view.result:
        result change
      mysql-test/t/subselect.test:
        fixed mistake of merge
      sql/field.cc:
        new 5.0 types support
        temporary table/db names detection in field fixed
      sql/field.h:
        removed non-existent methods
        added wrongly deleted during manual merge string
      sql/item.cc:
        support of new types added to merge of union types routines
      sql/item.h:
        fixed method definition
      sql/item_cmpfunc.cc:
        fixed type
      sql/item_func.h:
        item type name fixed
      sql/item_subselect.cc:
        added forgoten methods
      sql/item_subselect.h:
        fixed type
      sql/sql_derived.cc:
        fixed typo of manual merge
      sql/sql_view.cc:
        added new parameter
      9d7d3fb3
  23. 28 Mar, 2005 1 commit
    • unknown's avatar
      union.test: · a105d5bf
      unknown authored
        Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
        Prove that this problem was fixed with bug9425 fix too.
      
      
      mysql-test/t/union.test:
        Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
        Prove that this problem was fixed with bug9425 fix too.
      a105d5bf
  24. 23 Mar, 2005 1 commit
    • unknown's avatar
      fixed union types merging and table related metadata (BUG#8824) · 79a23f74
      unknown authored
      mysql-test/r/func_group.result:
        new result
      mysql-test/r/metadata.result:
        new result
        test of metadata of variables, unions and derived tables
      mysql-test/r/union.result:
        new results
        test of union of enum
      mysql-test/t/metadata.test:
        test of metadata of variables, unions and derived tables
      mysql-test/t/union.test:
        test of union of enum
      sql/field.cc:
        Field type merging rules added
        Fixed table name/alias returting for field made from temporary tables
      sql/field.h:
        removed unned field type reporting
      sql/item.cc:
        fixed bug in NEW_DATE type field creartion
        replaced mechanism of merging types of UNION
      sql/item.h:
        replaced mechanism of merging types of UNION
      sql/item_func.h:
        new item type to make correct field type detection possible
      sql/item_subselect.cc:
        added table name parameter to prepare() to show right table alias for derived tables
      sql/sql_derived.cc:
        added table name parameter to prepare() to show right table alias for derived tables
      sql/sql_lex.h:
        added table name parameter to prepare() to show right table alias for derived tables
      sql/sql_parse.cc:
        made function for enum/set pack length calculation
      sql/sql_prepare.cc:
        added table name parameter to prepare() to show right table alias for derived tables
      sql/sql_select.cc:
        new temporary table field creation by Item_type_holder
        fixed table alias for temporary table
      sql/sql_union.cc:
        added table name parameter to prepare() to show right table alias for derived tables
      79a23f74
  25. 13 Feb, 2005 1 commit
    • unknown's avatar
      Bug#2435 · 0b751b40
      unknown authored
        Alter handling for UNION syntax
        Tests for UNION and parentheses
      
      
      mysql-test/r/union.result:
        Bug#2435
          Tests for UNION and parentheses
      mysql-test/t/union.test:
        Bug#2435
          Tests for UNION and parentheses
      sql/sql_yacc.yy:
        Bug#2435
          Amend handling of UNION with parentheses.
      0b751b40
  26. 08 Feb, 2005 1 commit
    • unknown's avatar
      Precision Math implementation · c346d5c3
      unknown authored
      BitKeeper/etc/ignore:
        Added client/decimal.c client/my_decimal.cc client/my_decimal.h to the ignore list
      c346d5c3
  27. 04 Feb, 2005 1 commit
    • unknown's avatar
      A fix: bug#6931: Date Type column problem when using UNION-Table · ee41cbfc
      unknown authored
             bug#7833:  Wrong datatype of aggregate column is returned
      
      
      mysql-test/r/func_group.result:
        Test case for bug 7833:  Wrong datatype of aggregate column is returned
      mysql-test/r/union.result:
        Test case for bug 6931: Date Type column problem when using UNION-Table.
      mysql-test/t/func_group.test:
        Test case for bug 7833:  Wrong datatype of aggregate column is returned
      mysql-test/t/union.test:
        Test case for bug 6931: Date Type column problem when using UNION-Table.
      ee41cbfc
  28. 18 Jan, 2005 3 commits
    • unknown's avatar
      fixing wrong value for "examined rows" when UNION's are used. · 147d1ef1
      unknown authored
      mysql-test/r/union.result:
        result for a test case for the wrong examined rows with UNION's
      mysql-test/t/union.test:
        test case for the wrong examined rows with UNION's
      sql/sql_union.cc:
        a patch for the wrong examined rows with UNION's
      147d1ef1
    • unknown's avatar
      After-merge clean-up · 6fde17e5
      unknown authored
      6fde17e5
    • unknown's avatar
      1. Item now uses my_charset_bin by default, · 9ab94d6c
      unknown authored
      not default_charset_into. It fixes the
      problem that in some cases numbers where
      treated as CHAR(N), not as BINARY(N), e.g.
      wrong 'charsetnr' when sent to the client side.
      2. IFNULL didn't aggregate argument charsets
      and collations, so IFNULL(1,'a') produced
      a CHAR(N). Now produces a BINARY(N).
      3. SELECT PROCEDURE ANALIZE now returns
      BINARY columns, which is much better than it worked
      previously: CHAR with the default character set.
      But in the future it's worth to fix the fields
      'Field_name' and 'Optimal_fieldtype' to use UTF8,
      and 'Min_value' and 'Max_value' to inherit their charsets
      from the original items. But it is not important,
      and BINARY(N) is OK for now.
      4. Tests were fixed accordingly. No new tests were
      made, as the old onces cover everything.
      
      
      mysql-test/r/analyse.result:
        SELECT PROCEDURE ANALIZE now returns
        BINARY columns, which is much better than it worked
        previously: CHAR with the default character set.
        But in the future it's worth to fix the fields
        'Field_name' and 'Optimal_fieldtype' to use UTF8,
        and 'Min_value' and 'Max_value' to inherit their charsets
        from the original items. But it is not important,
        and BINARY(N) is OK for now.
      mysql-test/r/case.result:
        Test fix according to the changes
      mysql-test/r/metadata.result:
        Test fix according to the changes
      mysql-test/r/ps_1general.result:
        Test fix according to the changes
      mysql-test/r/ps_2myisam.result:
        Test fix according to the changes
      mysql-test/r/ps_3innodb.result:
        Test fix according to the changes
      mysql-test/r/ps_4heap.result:
        Test fix according to the changes
      mysql-test/r/ps_5merge.result:
        Test fix according to the changes
      mysql-test/r/ps_6bdb.result:
        Test fix according to the changes
      mysql-test/r/ps_7ndb.result:
        Test fix according to the changes
      mysql-test/r/union.result:
        Test fix according to the changes
      sql/item.cc:
        Item is now BINARY by default
      sql/item_cmpfunc.cc:
        IFNULL now collects arguments collations/charsets
        like other functions do.
      9ab94d6c
  29. 30 Dec, 2004 1 commit
    • unknown's avatar
      wl#1629 SHOW with WHERE(final part, after review) · a8491ce5
      unknown authored
        added syntax:
        'show variables where', 'show status where', 'show open tables where'
      
      
      mysql-test/r/grant_cache.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/information_schema.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/query_cache.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/temp_table.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/union.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/t/information_schema.test:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/t/query_cache.test:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/item.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/mysql_priv.h:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_parse.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_select.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_show.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_yacc.yy:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/table.h:
        wl#1629 SHOW with WHERE(final part,after review)
      a8491ce5
  30. 08 Dec, 2004 1 commit
  31. 07 Dec, 2004 1 commit
    • unknown's avatar
      Update results for new varchar handling · 5b3b9e78
      unknown authored
      Fixed compiler warnings
      String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      
      
      myisam/myisampack.c:
        Indentation cleanup
      mysql-test/r/analyse.result:
        Update results for new varchar handling
      mysql-test/r/case.result:
        Update results for new varchar handling
      mysql-test/r/cast.result:
        Update results for new varchar handling
      mysql-test/r/create.result:
        Update results for new varchar handling
      mysql-test/r/ctype_mb.result:
        Update results for new varchar handling
      mysql-test/r/ctype_ucs.result:
        Update results for new varchar handling
      mysql-test/r/ctype_utf8.result:
        Update results for new varchar handling
      mysql-test/r/func_group.result:
        Update results for new varchar handling
      mysql-test/r/func_str.result:
        Update results for new varchar handling
      mysql-test/r/func_system.result:
        Update results for new varchar handling
      mysql-test/r/heap.result:
        Update results for new varchar handling
      mysql-test/r/heap_hash.result:
        Update results for new varchar handling
      mysql-test/r/information_schema.result:
        Update results for new varchar handling
      mysql-test/r/metadata.result:
        Update results for new varchar handling
      mysql-test/r/null.result:
        Update results for new varchar handling
      mysql-test/r/ps_2myisam.result:
        Update results for new varchar handling
      mysql-test/r/ps_3innodb.result:
        Update results for new varchar handling
      mysql-test/r/ps_4heap.result:
        Update results for new varchar handling
      mysql-test/r/ps_5merge.result:
        Update results for new varchar handling
      mysql-test/r/ps_6bdb.result:
        Update results for new varchar handling
      mysql-test/r/subselect.result:
        Update results for new varchar handling
      mysql-test/r/type_ranges.result:
        Update results for new varchar handling
      mysql-test/r/union.result:
        Update results for new varchar handling
      mysql-test/t/heap.test:
        Update results for new varchar handling
      mysql-test/t/type_ranges.test:
        Added extra test to test generated type for string functions
      sql/field.cc:
        Update results for new varchar handling
      sql/field.h:
        Update results for new varchar handling
        We have to use orig_table instead of table as 'table' may point to a new field in the created table
      sql/field_conv.cc:
        Update results for new varchar handling
      sql/ha_heap.cc:
        Indentation fixes
      sql/ha_innodb.cc:
        Update results for new varchar handling
      sql/item.cc:
        Update results for new varchar handling
        Remove compiler warnings
        String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      sql/item.h:
        Update results for new varchar handling
      sql/item_func.cc:
        Update results for new varchar handling
        String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      sql/item_func.h:
        ANALYZE now return VARCHAR columns
      sql/procedure.h:
        Update results for new varchar handling
      sql/sql_acl.cc:
        After merge fixes
      sql/sql_select.cc:
        Update results for new varchar handling
        String results in temporary tables are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      sql/sql_show.cc:
        After merge fixes
      sql/sql_table.cc:
        After merge fixes
      strings/ctype-tis620.c:
        After merge fixes
      tests/client_test.c:
        Fixed results, as in MySQL 5.0 strings in CREATE ... SELECT are creates VARCHAR columns
      5b3b9e78
  32. 18 Nov, 2004 1 commit
  33. 18 Oct, 2004 1 commit
  34. 17 Sep, 2004 1 commit
  35. 06 Sep, 2004 1 commit