1. 14 Mar, 2007 4 commits
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 8fa44178
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug24778
      
      
      8fa44178
    • unknown's avatar
      WL#3527 : inspected a 5.1 covarage report · f0c50440
      unknown authored
      
      sql/item.cc:
        WL#3527 : inspected a covarage report
      f0c50440
    • unknown's avatar
      Bug #24778: Innodb: No result when using ORDER BY · 7a3148a7
      unknown authored
      This bug was intruduced by the fix for bug#17212 (in 4.1). It is not 
      ok to call test_if_skip_sort_order since this function will 
      alter the execution plan. By contract it is not ok to call 
      test_if_skip_sort_order in this context.
      
      This bug appears only in the case when the optimizer has chosen 
      an index for accessing a particular table but finds a covering 
      index that enables it to skip ORDER BY. This happens in 
      test_if_skip_sort_order.
      
      
      mysql-test/r/key.result:
        Bug#24778
        
        test case.
        
        The bug causes the result to be the empty set.
      mysql-test/t/key.test:
        Bug#24778
        
        The minimal test case that reveals the bug. The reason for such a 
        complicated schema is that we have to convince the optimizer to 
        pick one index, then discard it in order to be able to skip 
        ORDER BY.
      sql/sql_select.cc:
        bug#24778
        
        Removed the call to test_if_skip_sort_order that constituted the
        bug.
      7a3148a7
    • unknown's avatar
      Bug #26794: 5.1 part · 6e10a204
      unknown authored
       It was syntactically correct to define 
       spatial keys over parts of columns (e.g.
       ALTER TABLE t1 ADD x GEOMETRY NOT NULL, 
         ADD SPATIAL KEY (x(32))).
       This may lead to undefined results and/or
       interpretation.
       Fixed by not allowing partial column 
       specification in a SPATIAL index definition.
      
      
      mysql-test/r/alter_table.result:
        Bug #26794: 5.1 part
         test case
      mysql-test/r/gis-rtree.result:
        Bug #26794: 5.1 part
         updated the tests to the new syntax
      mysql-test/t/alter_table.test:
        Bug #26794: 5.1 part
         test case
      mysql-test/t/gis-rtree.test:
        Bug #26794: 5.1 part
         updated the tests to the new syntax
      sql/sql_table.cc:
        Bug #26794: 5.1 part
         Disable defining SPATIAL KEYS with sub-key parts
      6e10a204
  2. 12 Mar, 2007 3 commits
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B26794-5.0-opt · d9210613
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B26794-5.1-opt
      
      
      mysql-test/r/gis-rtree.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/alter_table.result:
        tests merge
      mysql-test/t/alter_table.test:
        tests merge
      d9210613
    • unknown's avatar
      Bug #26794: · bd6aecf3
      unknown authored
      Different set of conditions is used to verify
      the validity of index definitions over a GEOMETRY
      column in ALTER TABLE and CREATE TABLE. 
      The difference was on how sub-keys notion validity
      is checked.
      Fixed by extending the CREATE TABLE condition to
      support the cases allowed in ALTER TABLE.
      Made the SHOW CREATE TABLE not to display spatial
      indexes using the sub-key notion.
      
      
      mysql-test/r/alter_table.result:
        Bug #26794: test case
      mysql-test/r/gis-rtree.result:
        Bug #26794: fixed SHOW CREATE TABLE output.
      mysql-test/t/alter_table.test:
        Bug #26794: test case
      sql/field.cc:
        Bug #26794: Allow sub-keys for GEOMETRY
      sql/sql_show.cc:
        Bug #26794: Don't show sub-key notion 
         in SHOW CREATE TABLE for SPATIAL indexes.
      sql/sql_table.cc:
        Bug #26794: Allow sub-keys for GEOMETRY
      bd6aecf3
    • unknown's avatar
      group_by.result: · 4ce3624e
      unknown authored
        WL3527: disable wrong optimization.
      sql_select.cc:
        WL#3527: disable wrong optimization.
      
      
      sql/sql_select.cc:
        WL#3527: disable wrong optimization.
      mysql-test/r/group_by.result:
        WL3527: disable wrong optimization.
      4ce3624e
  3. 11 Mar, 2007 4 commits
    • unknown's avatar
      WL3527: post-merge updates · 0f793369
      unknown authored
      sql_yacc.yy:
        WL3527: updated the diff to use correct parser words
      table.cc:
        WL3527: exteneded the fix for bug #20604 to fit the new variables
      sql_select.cc:
        WL3527: renamed used_keys to covering_keys
      
      
      sql/sql_select.cc:
        renamed used_keys to covering_keys
      sql/sql_yacc.yy:
        WL3527: updated the diff to use correct parser words
      sql/table.cc:
        WL3527: exteneded the fix for bug #20604 to fit the new variables
      0f793369
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 6d7e9bcc
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
      
      
      sql/sql_yacc.yy:
        Auto merged
      6d7e9bcc
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 00a18149
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
      
      
      sql/item.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      00a18149
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 05c534be
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.0-opt-merge-5.1-opt
      
      
      mysql-test/r/func_str.result:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      05c534be
  4. 10 Mar, 2007 5 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a140cb7
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
      
      
      mysql-test/r/explain.result:
        Auto merged
      mysql-test/r/func_default.result:
        Auto merged
      mysql-test/r/func_regexp.result:
        Auto merged
      mysql-test/r/func_test.result:
        Auto merged
      mysql-test/r/having.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/varbinary.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      mysql-test/r/func_str.result:
        Manually merged
      mysql-test/t/func_str.test:
        Manually merged
      8a140cb7
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql · 2f774b47
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
      
      
      sql/item_strfunc.cc:
        Auto merged
      mysql-test/r/func_str.result:
        SCCS merged
      mysql-test/t/func_str.test:
        SCCS merged
      2f774b47
    • unknown's avatar
      Bug#15757: Wrong SUBSTRING() result when a tmp table was employed. · 816ea8a3
      unknown authored
      When the SUBSTRING() function was used over a LONGTEXT field the max_length of
      the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
      parameter is used while tmp field creation it limits the length of the result
      field and leads to printing an empty string instead of the correct result.
      
      Now the Item_func_substr::fix_length_and_dec() function correctly calculates
      the max_length parameter.
      
      
      mysql-test/t/func_str.test:
        Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
      mysql-test/r/func_str.result:
        Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
      sql/item_strfunc.cc:
        Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
        Now the Item_func_substr::fix_length_and_dec() function correctly calculates
        the max_length parameter.
      816ea8a3
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c0a05435
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      sql/item.cc:
        Auto merged
      c0a05435
    • unknown's avatar
      Fixed bug #26830: a crash for the query with a subselect containing ROLLUP. · 4d6ad7ac
      unknown authored
      Crash happened because the function get_best_group_min_max detected
      joins with ROLLUP incorrectly.
      
      
      mysql-test/r/olap.result:
        Added a test case for bug #26830.
      mysql-test/t/olap.test:
        Added a test case for bug #26830.
      4d6ad7ac
  5. 09 Mar, 2007 21 commits
    • unknown's avatar
      Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 944030ae
      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.
      944030ae
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 8555b8d7
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
      
      
      BitKeeper/deleted/.del-sql_parse.cc.rej:
        Auto merged
      BitKeeper/deleted/.del-table.cc.rej:
        Auto merged
      mysql-test/r/endspace.result:
        Auto merged
      mysql-test/t/group_by.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89:
        Auto merged
      mysql-test/r/group_by.result:
        manual merge to 5.1-opt
      sql/mysqld.cc:
        manual merge to 5.1-opt
      sql/sql_base.cc:
        manual merge to 5.1-opt
      sql/sql_select.cc:
        manual merge to 5.1-opt
      sql/table.h:
        manual merge to 5.1-opt
      8555b8d7
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge · 60253fd2
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt
      
      
      mysql-test/r/select.result:
        null-merge
      mysql-test/t/select.test:
        null-merge
      sql/sql_yacc.yy:
        null-merge
      60253fd2
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge · 4aca623a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      4aca623a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 81beab69
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/select.result:
        merge
      mysql-test/t/select.test:
        merge
      81beab69
    • unknown's avatar
      WL#3527: Extend IGNORE INDEX so places where index is ignored can · ff79cd68
      unknown authored
               be specified
       5.0 part of the fix. Implements IGNORE INDEX FOR JOIN as a synonym
       of IGNORE INDEX for backward compatibility with the 5.1 fix.
      
      
      mysql-test/r/select.result:
        WL#3527: Extend IGNORE INDEX so places where index is ignored can 
                 be specified
        - test case
      mysql-test/t/select.test:
        WL#3527: Extend IGNORE INDEX so places where index is ignored can 
                 be specified
        - test case
      ff79cd68
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 209802eb
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/item.cc:
        Auto merged
      209802eb
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 52fb60da
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
      
      
      52fb60da
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · d5f3bc14
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      d5f3bc14
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c7de22a1
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
      
      
      sql/item_strfunc.cc:
        Auto merged
      mysql-test/r/func_str.result:
        resolved test merge conflicts
      mysql-test/t/func_str.test:
        resolved test merge conflicts
      c7de22a1
    • unknown's avatar
      Bug #26281: · 29b6d554
      unknown authored
       Fixed boundry checks in the INSERT() function:
       were one off.
      
      
      mysql-test/r/func_str.result:
        Bug #26281: test case
      mysql-test/t/func_str.test:
        Bug #26281: test case
      sql/item_strfunc.cc:
        Bug #26281: fixed boundry checks
      29b6d554
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e68df7a1
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      e68df7a1
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 413604f9
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
      
      
      413604f9
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 84ceb01e
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      84ceb01e
    • unknown's avatar
      Fixed bug #26661: crash when order by clause in a union · 729bcaf4
      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.
      729bcaf4
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 76542acd
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/sql_select.cc:
        Auto merged
      76542acd
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 0b85b793
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      mysql-test/t/func_str.test:
        merging
      mysql-test/t/view.test:
        merging
      0b85b793
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · 3cd8b881
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      3cd8b881
    • unknown's avatar
      aftermerge fix · 32ed7ddc
      unknown authored
      
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      32ed7ddc
    • unknown's avatar
      aftermerge fix · 5c1e48c5
      unknown authored
      
      mysql-test/r/view.result:
        merging
      5c1e48c5
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-5.1 · e51213dd
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      e51213dd
  6. 08 Mar, 2007 3 commits
    • unknown's avatar
      rpl_ssl.result, rpl_ssl.test: · d4ede3f5
      unknown authored
        Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
      
      
      mysql-test/t/rpl_ssl.test:
        Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
      mysql-test/r/rpl_ssl.result:
        Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
      d4ede3f5
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · 3d52be15
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/func_str.result:
        merging
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      mysql-test/t/func_str.test:
        merging
      mysql-test/t/view.test:
        merging
      3d52be15
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 12af6585
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/func_str.result:
        merging
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      mysql-test/t/func_str.test:
        merging
      mysql-test/t/view.test:
        merging
      12af6585