1. 01 Jun, 2005 4 commits
  2. 31 May, 2005 12 commits
  3. 30 May, 2005 10 commits
    • unknown's avatar
      One more post-review fix. · 2c9b9e9a
      unknown authored
      2c9b9e9a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 595e3609
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-7306-new
      
      
      sql/sql_delete.cc:
        Auto merged
      595e3609
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7878189d
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-7306-new
      
      
      sql/item_subselect.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        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_olap.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      7878189d
    • unknown's avatar
      Preparatory (and the most problematic) patch for Bug#7306 · a127820a
      unknown authored
      "the server side preparedStatement error for LIMIT placeholder",
      which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
      and later steps.
      After-review fixes.
      
      
      mysql-test/r/group_min_max.result:
        Test results fixed for EXPLAINs when using GROUP_MIN_MAX access plan.
      sql/item_subselect.cc:
        Move setting of the internal LIMIT used for IN/ALL/ANY/EXISTS 
        subqueries to one place: Item_exists_subselect::fix_length_and_dec().
        This implies that unit->select_limit_cnt is not set until the item is 
        fixed. This is OK, as now LIMIT values are not used until JOIN::optimize.
      sql/mysql_priv.h:
        setup_tables no longer needs a special flag for the case when
        it's called from JOIN::reinit() (we don't need to call setup_tables
        between two executions of a correlated subquery).
      sql/opt_range.cc:
        Fix a glitch in GROUP_MIN_MAX access plan: we should use table metadata,
        not field data, to evaluate max_used_key_length, which is then
        used for explain.
      sql/sp.cc:
        - setup_tables signature changed.
      sql/sql_base.cc:
        - setup_tables no longer needs a special mode for subqueries.
          Unused checks were removed.
      sql/sql_delete.cc:
        - setup_tables signature changed
      sql/sql_help.cc:
        - setup_tables signature changed
      sql/sql_insert.cc:
        - setup_tables signature changed
      sql/sql_lex.cc:
        Consolidate setting of internal LIMIT for IN/ALL/ANY/EXISTS subqeries
        in one place, and hence remove it from st_select_lex::test_limit().
      sql/sql_lex.h:
        Cleanup signature of st_select_lex_unit::init_prepare_fake_select_lex().
      sql/sql_load.cc:
        - setup_tables signature changed
      sql/sql_olap.cc:
        - setup_tables signature changed
      sql/sql_parse.cc:
        - st_select_lex_unit::set_limit() signature changed
      sql/sql_select.cc:
        Move setting of JOIN::select_limit from JOIN::prepare
        to JOIN::optimize. At prepare, limit is unknown yet.
        Remove excessive cleanups from JOIN::reinit which were overwriting
        join->join_tab[i]->table->used_keys. This fixes the bug which was triggered
        by the change in item_subselect.cc.
      sql/sql_union.cc:
        Class st_select_lex_unit was changed to avoid calls to 
         st_select_lex_unit::set_limit from places where it may be unknown.
        Now unit->select_limit_cnt is set at ::exec(). 
        st_select_lex_unit::init_prepare_fake_select_lex(): 
         - move out set_limit functionality
         - remove a few lines of dead code.
        st_select_lex_unit::prepare():
          - now we don't call set_limit at the time of prepare, so the value  
            of unit->select_limit_cnt may be unknown here. Use sl->select_limit
            instead.
        st_select_lex_unit::exec():
          - cleanup
          - call set_limit explicitly as it has been moved out of 
           init_prepare_fake_select_lex.
      sql/sql_update.cc:
        - setup_tables signature changed
      a127820a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 89e50fd1
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
      
      89e50fd1
    • unknown's avatar
      Added test for bug #5894 "Triggers with altered tables cause corrupt · 380a5d39
      unknown authored
      databases" and basic handling of errors which happen in triggers.
      (The bug itself was fixed by several previous patches).
      Fixed bug in multi-delete which were exposed by these tests.
      
      
      mysql-test/r/trigger.result:
        Added test for bug #5894 "Triggers with altered tables cause corrupt
        databases" and basic handling of errors which happen in triggers.
      mysql-test/t/trigger.test:
        Added test for bug #5894 "Triggers with altered tables cause corrupt
        databases" and basic handling of errors which happen in triggers.
      sql/sql_delete.cc:
        multi_delete::send_eof():
          Fixed bug which were exposed by testing of basic handling of errors
          in triggers. Error which happened in multi_delete::do_deletes() 
          was wiped out by thd->clear_error() and thus never sent to client
          (and this stalled client connection).
      380a5d39
    • unknown's avatar
      Manual post merge · c04e901a
      unknown authored
      
      mysql-test/t/olap.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/olap.result:
        Manual merge
      c04e901a
    • unknown's avatar
      sql_select.cc: · b8290da9
      unknown authored
        Post-review modifications for the fix of bug #7894.
      
      
      sql/sql_select.cc:
        Post-review modifications for the fix of bug #7894.
      b8290da9
    • unknown's avatar
      olap.result, olap.test: · 14541668
      unknown authored
        Added test cases for bug #7894.
      sql_select.cc:
        Fixed bug #7894: GROUP BY queries with ROLLUP returned
        wrong results for expressions containing group by columns.
        The fix ensured correct results by replacement of all
        occurrences of group by fields in non-aggregate expressions
        for corresponding ref objects and preventing creation of
        fields in temporary tables for expression containing group
        by fields.
      
      
      sql/sql_select.cc:
        Fixed bug #7894: GROUP BY queries with ROLLUP returned
        wrong results for expressions containing group by columns.
        The fix ensured correct results by replacement of all
        occurrences of group by fields in non-aggregate expressions
        for corresponding ref objects and preventing creation of
        fields in temporary tables for expression containing group
        by fields.
      mysql-test/t/olap.test:
        Added test cases for bug #7894.
      mysql-test/r/olap.result:
        Added test cases for bug #7894.
      14541668
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · ab69186d
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      ab69186d
  4. 29 May, 2005 2 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2dc4e048
      unknown authored
      into  moonbone.local:/work/mysql-5.0-bug-9593
      
      
      sql/sql_select.cc:
        Auto merged
      2dc4e048
    • unknown's avatar
      Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the · fd134c8e
      unknown authored
      server"
      Bug appears only on Windows platform. Freeing memory in 
      TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in 
      setup_copy_fields() results in memory destruction. In test IF used instead 
      of CONCAT because IF have more stable crash.
      
      
      
      sql/sql_select.cc:
        Fix bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server
      mysql-test/t/count_distinct.test:
        test for bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server
      mysql-test/r/count_distinct.result:
        Test for bug #9593 The combination of COUNT, DISTINCT and CONCAT seems to lock the server
      fd134c8e
  5. 28 May, 2005 2 commits
  6. 27 May, 2005 10 commits