1. 29 Aug, 2007 1 commit
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B30377-5.0-opt · 79e87471
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30377-5.1-opt
      
      
      mysql-test/t/status.test:
        Auto merged
      mysql-test/r/status.result:
        merge 5.0->5.1 of the fix for bug 30377
      sql/sql_lex.h:
        merge 5.0->5.1 of the fix for bug 30377
      sql/sql_select.cc:
        merge 5.0->5.1 of the fix for bug 30377
      79e87471
  2. 28 Aug, 2007 4 commits
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 53daf2e6
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/5.1o-bug30596
      
      
      sql/sql_select.cc:
        Auto merged
      53daf2e6
    • unknown's avatar
      Bug #30596 GROUP BY optimization gives wrong result order · 22440b53
      unknown authored
        
      The optimization that uses a unique index to remove GROUP BY did not 
      ensure that the index was actually used, thus violating the ORDER BY
      that is implied by GROUP BY.
      Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
      a unique index over non-nullable field(s). In case GROUP BY ... ORDER BY 
      null is used, GROUP BY is simply removed.
      
      
      mysql-test/include/mix1.inc:
        Bug#30596: Test case for InnoDB
        Here, as opposed to for MyISAM, row lookup is done using index 
        whenever the index covers the group list.
      mysql-test/r/distinct.result:
        Bug#30596: Changed test case. 
        Prior to Bug#16458, These queries use temp table and filesort. The
        bug was that they used a temp table. However, that patch removed
        filesort also, in which case we can no longer gurantee correct ordering.
      mysql-test/r/group_by.result:
        Bug#30596: Correct result
        The test case for IGNORE INDEX FOR GROUP BY gets degraded performance 
        (unneccesary filesort). This is due to Bug#30665, which will be fixed separately.
      mysql-test/r/innodb_mysql.result:
        Bug#30596: Test result
      mysql-test/t/group_by.test:
        Bug#30596: Test case
      sql/sql_select.cc:
        Bug#30596: The fix: 
        - replace GROUP BY with ORDER BY unless ORDER BY [NULL|<constant>]
        - make sure to use the keys for GROUP BY in this ORDER BY.
      22440b53
    • unknown's avatar
      Bug #30377: EXPLAIN loses last_query_cost when used with UNION · 310afbd4
      unknown authored
      Currently the Last_query_cost session status variable shows
      only the cost of a single flat subselect. For complex queries
      (with subselects or unions etc) Last_query_cost is not valid
      as it was showing the cost for the last optimized subselect.
      Fixed by reseting to zero Last_query_cost when the complete
      cost of the query cannot be determined.
      Last_query_cost will be non-zero only for single flat queries.
      
      
      mysql-test/r/status.result:
        Bug #30377: test case
      mysql-test/t/status.test:
        Bug #30377: test case
      sql/sql_lex.h:
        Bug #30377: helper function
      sql/sql_select.cc:
        Bug #30377: don't assign cost if not on single level statement
      310afbd4
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 8c31792c
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28284-5.1-opt
      
      
      include/my_pthread.h:
        Auto merged
      8c31792c
  3. 26 Aug, 2007 3 commits
  4. 25 Aug, 2007 8 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · fb3a392f
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      fb3a392f
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1 · 08fdc882
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      08fdc882
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · c81d4aac
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      c81d4aac
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 92c9c80d
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/t/type_bit.test:
        Auto merged
      sql/sql_select.cc:
        Merge with 5.0-opt.
      92c9c80d
    • unknown's avatar
      sql_select.cc: · 5b03876f
      unknown authored
        Additional fix for the bug#30245.
      
      
      sql/sql_select.cc:
        Additional fix for the bug#30245.
      5b03876f
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel · 36553dfd
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      36553dfd
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main · fe471aed
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      client/mysqldump.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/status.result:
        Auto merged
      sql/event_db_repository.cc:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/status.test:
        Manual resolve with 5.1.
      sql/log_event.cc:
        Manual resolve with 5.1.
      sql/sql_yacc.yy:
        Manual resolve with 5.1.
      fe471aed
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main · 863a4301
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
      
      
      863a4301
  5. 24 Aug, 2007 24 commits