An error occurred fetching the project authors.
  1. 23 Jun, 2004 1 commit
    • unknown's avatar
      handler interface cleanups: · 9a554b47
      unknown authored
        more logical table/index_flags
        return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
        max_keys and other limits renamed to max_supported_keys/etc
        max_keys/etc are now wrappers to max_supported_keys/etc 
        ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
      
      
      include/myisam.h:
        increasing myisam_max_temp_file_length
      include/my_base.h:
        handler interface cleanup
      myisam/mi_static.c:
        warning removed
      mysql-test/Makefile.am:
        followup
      mysql-test/r/fulltext.result:
        fulltext indexes are not ordered
      mysql-test/r/rpl_user_variables.result:
        followup
      sql/field.cc:
        index_flags
      sql/filesort.cc:
        rnd_init -> ha_rnd_init
        rnd_end -> ha_rnd_end
      sql/ha_berkeley.cc:
        cleanup
      sql/ha_berkeley.h:
        table/index_flags revamped
      sql/ha_heap.cc:
        ensure index is accessed only after index_init (esp. important for temp tables)
      sql/ha_heap.h:
        table/index_flags revamped
      sql/ha_innodb.cc:
        don't workaround MySQL sloppiness
      sql/ha_innodb.h:
        table/index_flags revamped
      sql/ha_isam.h:
        table/index_flags revamped
      sql/ha_isammrg.h:
        table/index_flags revamped
      sql/ha_myisam.cc:
        ensure index is accessed only after index_init (esp. important for temp tables)
      sql/ha_myisam.h:
        table/index_flags revamped
      sql/ha_myisammrg.h:
        table/index_flags revamped
      sql/handler.cc:
        handler interface cleanups
      sql/handler.h:
        handler interface cleanups:
          more logical table/index_flags
          return  HA_ERR_WRONG_COMMAND instead of abstract methods
          max_keys and other limits renamed to max_supported_keys/etc
          max_keys/etc are now wrappers to max_supported_keys/etc 
          ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to enforce strict pairing
      sql/item_subselect.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/lex.h:
        renamed to avoid conflicts
      sql/opt_range.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/opt_range.h:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/opt_sum.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/records.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_acl.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_cache.cc:
        cleanup
      sql/sql_delete.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_handler.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_help.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_insert.cc:
        table/index_flags cleanup
      sql/sql_select.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/sql_table.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
        table/index_flags cleanup
      sql/sql_update.cc:
        index_init/index_end/rnd_init/rnd_end strict pairing fixed
      sql/sql_yacc.yy:
        INDEX -> INDEX_SYM
      sql/table.cc:
        table/index_flags cleanup
      9a554b47
  2. 21 Jun, 2004 1 commit
    • unknown's avatar
      Unused variables removed (many files). · de628592
      unknown authored
      sql/item_func.cc:
        Unused variable 'thd' removed.
      sql/item_subselect.cc:
        Unused variable 'type' removed.
      sql/slave.cc:
        Unused variable 'return_val' removed.
      sql/sql_derived.cc:
        Unused variable 'is_subsel' removed.
      sql/sql_parse.cc:
        Unused variables 'pstr' and 'create_info' removed.
      sql/sql_prepare.cc:
        Unused variable 'res' removed.
      sql/time.cc:
        Unused variable 'str_begin' removed.
      de628592
  3. 09 Jun, 2004 1 commit
    • unknown's avatar
      do not unlock tables early if we have subquery in HAVING clause (BUG#3984) · 07b5fdbc
      unknown authored
      mysql-test/r/subselect_innodb.result:
        test of unlocking innodb tables and subquery in HAVING clause
      mysql-test/t/subselect_innodb.test:
        test of unlocking innodb tables and subquery in HAVING clause
      sql/item_subselect.cc:
        mark SELECT with subquery in HAVING clause
      sql/sql_lex.cc:
        mark SELECT with subquery in HAVING clause
      sql/sql_lex.h:
        mark SELECT with subquery in HAVING clause
      sql/sql_select.cc:
        do not unlock tables early if we have subquery in HAVING clause
      07b5fdbc
  4. 07 May, 2004 1 commit
    • unknown's avatar
      keep old engine & JOIN if we changed subquery Item (Bug #3646) · e54ca13b
      unknown authored
      mysql-test/r/subselect.result:
        ALL/ANY test
      mysql-test/t/subselect.test:
        ALL/ANY test
      sql/item_subselect.cc:
        keep old engine & JOIN if we changed subquery Item, which allow avoid second all SELECT items fix_fields call with pervios clean up (because of second setup_tables which remove table->key_use and maybe something else)
        keep list when we change Item in SELECT list
        processing inserted max/min function (now JOIN::prepare will be called only once)
        methods of changing item for subselect engines
      sql/item_subselect.h:
        change item & results procedure
      sql/item_sum.cc:
        Item_sum_hybrid::clear moved to .cc file (to keep .h clean and to make inserving/removing debug info easy)
      sql/item_sum.h:
        Item_sum_hybrid::clear moved to .cc file (to keep .h clean and to make inserving/removing debug info easy)
      sql/sql_lex.cc:
        note about new method
      sql/sql_lex.h:
        method for changing result of UNION JOINs
      sql/sql_select.cc:
        method for changing result in JOIN
      sql/sql_select.h:
        method for changing result in JOIN
      sql/sql_union.cc:
        method for changing result in JOIN
      e54ca13b
  5. 15 Apr, 2004 1 commit
    • unknown's avatar
      Formatting changes requested by Monty · 43dcf48e
      unknown authored
      sql/gen_lex_hash.cc:
        Minor changes 
         - fix space between for and (
      sql/item_subselect.cc:
        Minor changes 
         - fix space between for and (
      sql/sql_lex.cc:
        Minor changes 
         - fix space between for and (
      sql/sql_string.cc:
        Minor changes 
         - fix space between for and (
      43dcf48e
  6. 20 Mar, 2004 1 commit
    • unknown's avatar
      after review changes · f379d7b1
      unknown authored
      sql/item.cc:
        removed double_fix & already_fixed in Item_field
      sql/item.h:
        added quick_fix_field() for cases when we are sure that no need full fix_field processing
        fixed neg() method for numeric constants to have the same logic as constant parser
        Item_null, Item_real, ... are constant which are fixed by creation
      sql/item_cmpfunc.h:
        right fix_fields in and_conds call
      sql/item_func.cc:
        changed Item_field constructor call
        fix_field emulation call
      sql/item_strfunc.cc:
        correct layout
      sql/item_subselect.cc:
        correct layout
        changed Item_field constructor call
      sql/item_sum.cc:
        changed Item_field constructor call
      sql/item_sum.h:
        changed Item_field constructor call
      sql/sql_base.cc:
        fixed layout
        right fix_fields calls
      sql/sql_help.cc:
        changed Item_field constructor call
      sql/sql_load.cc:
        changed Item_field constructor call
      sql/sql_parse.cc:
        constant changed
      sql/sql_select.cc:
        fixed layout
        fix_field emulation insted of real fix_fields call
      sql/sql_show.cc:
        changed Item_field constructor call
      sql/sql_union.cc:
        changed Item_field constructor call
        double_fix removed
      sql/sql_update.cc:
        renamed variable, fixed layout
      sql/sql_yacc.yy:
        typo fixed
        fix_fields emulation calls
        hegation of numbers fixed
      f379d7b1
  7. 18 Mar, 2004 1 commit
    • unknown's avatar
      DBUG_ASSERT(fixed == 1); added to val* · 1a81e041
      unknown authored
      small optimisation in signed_literal
      
      
      sql/field.cc:
        layout fixed
      sql/item.cc:
        DBUG_ASSERT(fixed == 1); added to val*
        layout fixed
        fixed= 1; added where it was forgoten in fix_fields
        Item_string can be used without fix_fields
      sql/item.h:
        DBUG_ASSERT(fixed == 1); added to val*
        Item_string can be used without fix_fields
      sql/item_cmpfunc.cc:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_cmpfunc.h:
        fixed layout and getting Item statistic
      sql/item_func.cc:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_func.h:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_geofunc.cc:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_strfunc.cc:
        DBUG_ASSERT(fixed == 1); added to val*
        layout fixed
      sql/item_strfunc.h:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_subselect.cc:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_sum.cc:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_sum.h:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_timefunc.cc:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_timefunc.h:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/item_uniq.h:
        DBUG_ASSERT(fixed == 1); added to val*
      sql/sql_base.cc:
        Item creation revised
      sql/sql_help.cc:
        Item creation revised
      sql/sql_load.cc:
        Item creation revised
      sql/sql_parse.cc:
        fix_field call added
      sql/sql_select.cc:
        Item creation revised
      sql/sql_show.cc:
        Item creation revised
      sql/sql_union.cc:
        Item creation revised
      sql/sql_update.cc:
        Item creation revised
      sql/sql_yacc.yy:
        Item creation revised
        small optimisation in signed_literal
      1a81e041
  8. 17 Mar, 2004 1 commit
    • unknown's avatar
      DBUG_ASSERT(fixed == 0) added to fix_fields() · f83cf414
      unknown authored
      sql/item.cc:
        layout fixed
        fixed bug in prepared statements with subqueries and outer references
      sql/item.h:
        neg_transformer get thd argument to call fix_fields
      sql/item_cmpfunc.cc:
        DBUG_ASSERT(fixed == 0) added to fix_fields()
        fixed Item_in_optimizer fixed flag
        neg_arguments(), neg_transformer() call fix_field() on created items to avoid bouble fix field or non-called fixfields()
      sql/item_cmpfunc.h:
        neg_transformer get thd argument to call fix_fields
        fixed forgoten cleanup() call of parent class
      sql/item_func.cc:
        DBUG_ASSERT(fixed == 0) and fixed flag check added to fix_fields()
      sql/item_func.h:
        DBUG_ASSERT(fixed == 0) added to fix_fields()
        fixed forgoten cleanup() call of parent class
      sql/item_row.cc:
        DBUG_ASSERT(fixed == 0) added to fix_fields()
        added forgoten 'fixed' flag set
      sql/item_subselect.cc:
        DBUG_ASSERT(fixed == 0) added to fix_fields()
        fixed subquery transformation
      sql/sql_base.cc:
        check of fixed flag added
      sql/sql_derived.cc:
        fixed cleunup union in derived table during EXPLAIN command processing
      sql/sql_select.cc:
        thd argument add to function to allow call fix_fields() of new created items
        fixed EXPLAIN double preparation
        check of fixed flag added
        eliminate_not_funcs fixed for corrcet fix_fields call of new created items
      sql/sql_select.h:
        thd argument add to function to allow call fix_fields() of new created items
      sql/sql_union.cc:
        union processing fixed
      tests/client_test.c:
        layout fixed
        new test of outer references fron subqueries
      f83cf414
  9. 09 Mar, 2004 1 commit
  10. 20 Feb, 2004 1 commit
    • unknown's avatar
      after review fix · 7dd164f7
      unknown authored
      sql/item.h:
        typo fixed
      sql/item_func.h:
        clear refernce on deleted variable
      sql/item_subselect.cc:
        layout fixed
      sql/sql_base.cc:
        temporary memory pool allocation moved from open_and_lock_tables
      sql/sql_prepare.cc:
        temporary memory pool allocation moved
        changing in routine suggeted by Monty
      tests/client_test.c:
        uncomment accidently commented test
      7dd164f7
  11. 18 Feb, 2004 1 commit
  12. 17 Feb, 2004 1 commit
    • unknown's avatar
      revision of fix_fields() calls (BUG2838) · ae7eec92
      unknown authored
      mysql-test/r/subselect.result:
        test suite for BUG#2838
      mysql-test/t/subselect.test:
        test suite for BUG#2838
      sql/item.cc:
        revision of fix_fields() calls
        removed unnecessary variabl, and used correct last parameter of fix_fields()
      sql/item_cmpfunc.cc:
        revision of fix_fields() calls (BUG#2838)
      sql/item_func.cc:
        revision of fix_fields() calls
      sql/item_row.cc:
        changed for efficience (and to be similar for Item_func::fix_fields)
      sql/item_subselect.cc:
        fixed last arguments for fix_fields call
      sql/item_sum.cc:
        layout fixed
        revision of fix_fields() calls
      sql/log_event.cc:
        revision of fix_fields() calls
      sql/set_var.cc:
        revision of fix_fields() calls
      sql/sql_base.cc:
        revision of fix_fields() calls
      sql/sql_class.cc:
        revision of fix_fields() calls
      sql/sql_handler.cc:
        revision of fix_fields() calls
      ae7eec92
  13. 12 Feb, 2004 1 commit
    • unknown's avatar
      memory leacks in PS with subqueries fixed (adddition to fix of BUG#2462) · 4b37cf65
      unknown authored
      sql/item.h:
        mechanism to keep reference in cache array for row IN
      sql/item_cmpfunc.cc:
        mechanism to keep reference in cache array for row IN
        layout fixed
      sql/item_cmpfunc.h:
        mechanism to keep reference in cache array for row IN
      sql/item_subselect.cc:
        fixed memory pools swapping
        prevented deleting Item_in_optimizer cache in case of row IN subquery
      sql/mysql_priv.h:
        declarations of function moved to be useful in sql_class.h
      sql/sql_base.cc:
        keep fields expanded from '*' in statement memory pool
      sql/sql_class.cc:
        fixed restoring/backup of memory pool and list of items
      sql/sql_class.h:
        memory allocation methods moved to Statement
        memory pool substituting for preparing
      sql/sql_lex.cc:
        ref_pointer_array kept in statement memory
      sql/sql_lex.h:
        reinitialization of UNIT
      sql/sql_prepare.cc:
        memory allocation/swapping fixed
      tests/client_test.c:
        layout fixed
      4b37cf65
  14. 08 Feb, 2004 1 commit
    • unknown's avatar
      fixed subquery with PS (BUG#2462) · 541cb675
      unknown authored
      fixed UNION preparation
      
      
      sql/item.cc:
        debug output added
      sql/item.h:
        debug output added
      sql/item_cmpfunc.cc:
        correct cleunup() for Item_in_optimizer
      sql/item_cmpfunc.h:
        correct cleunup() for Item_in_optimizer
        debug output added
      sql/item_func.h:
        debug output added
      sql/item_subselect.cc:
        support of prepared statemnts added - mostly memorry allocation manegement, only one trabsformatio & correct cleupup()
      sql/item_subselect.h:
        support of prepared statemnts added - mostly memorry allocation manegement, only one trabsformatio & correct cleupup()
      sql/item_sum.cc:
        debug output added
      sql/item_sum.h:
        debug output added
      sql/sql_class.cc:
        function to switch allocation arena for Items
      sql/sql_class.h:
        function to switch allocation arena for Items
        pointer on current prepared statement added
      sql/sql_lex.cc:
        comment fixed
      sql/sql_lex.h:
        item cleanup support
      sql/sql_prepare.cc:
        - fixed preparation of PS to avoid storing junk in its memory + correct work with union
        - fixed tables cleanup for UNION & subqueries
      sql/sql_select.cc:
        removed condition which is always true for now
        fixed layout
      sql/sql_union.cc:
        support of UNION subquery cleanup
      tests/client_test.c:
        test of repeatable subqueries
        test of correct UNION initialisation
      541cb675
  15. 02 Feb, 2004 1 commit
    • unknown's avatar
      avoid null check on fields where NULL is impossible · ecfaa752
      unknown authored
      (BUG#2393)
      
      
      mysql-test/r/subselect.result:
        BUG#2393 test suite
        test ref replaced ref_of_null joining
      mysql-test/t/subselect.test:
        BUG#2393 test suite
        test ref replaced ref_of_null joining
      sql/item_subselect.cc:
        avoid null check on fields where NULL is impossible
      sql/sql_select.cc:
        convert JT_REF_OR_NULL to JT_REF in case of impossible NULL and protect buffer of rewriting through join_tab->null_ref_key
      ecfaa752
  16. 31 Jan, 2004 1 commit
    • unknown's avatar
      fix for the bug #2419: order by ignores rows. · abc17f8f
      unknown authored
      null_ref_key moved to TABLE_REF.
      new null range created if necessary.
      
      
      mysql-test/r/order_by.result:
        fix for the bug #2419: order by ignores rows
      mysql-test/t/order_by.test:
        fix for the bug #2419: order by ignores rows
      sql/item_subselect.cc:
        fix for the bug #2419: order by ignores rows
      sql/opt_range.cc:
        fix for the bug #2419: order by ignores rows
      sql/sql_select.cc:
        fix for the bug #2419: order by ignores rows
      sql/sql_select.h:
        fix for the bug #2419: order by ignores rows
      abc17f8f
  17. 30 Dec, 2003 1 commit
    • unknown's avatar
      Fix for prepared statements · 367ded9f
      unknown authored
      Here i added Item_*::cleanup() functions,
      removed a lot of ~Item_*'s,
      added code to restore order_list and group_list
      
      
      sql/item.cc:
        cleanups methods implemented
        Item_ref constructors changed
      sql/item.h:
        cleanups declared
        Item_ref constructors changed
        some ~Item_* deleted
      sql/item_cmpfunc.cc:
        new Item_ref format
      sql/item_cmpfunc.h:
        saving/restoring of the original arguments added to
        eq and equal functions
      sql/item_func.cc:
        New Item_ref format
      sql/item_func.h:
        destructors removed/changed to 'cleanup()'
      sql/item_row.cc:
        New Item_ref format
      sql/item_row.h:
        ~Item_row -> cleanup()
      sql/item_strfunc.cc:
        new Item_ref format
      sql/item_strfunc.h:
        destructors removed
      sql/item_subselect.cc:
        Item_subselect implementation,
        new Item_ref() format
      sql/item_subselect.h:
        cleanups for subselects declared
      sql/item_sum.cc:
        cleanups implementations
      sql/item_sum.h:
        cleanups declarations
        destructors removed
      sql/mysql_priv.h:
        free_items, cleanup_items exported
      sql/sql_prepare.cc:
        cleanup_items, free_items calls added
        stmt->query_id= thd->query_id restored
        cleanup procedures for group_list and order_list added
      sql/sql_yacc.yy:
        New Item_ref() format
      367ded9f
  18. 25 Dec, 2003 1 commit
    • unknown's avatar
      Fix for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem. · 17e54cf4
      unknown authored
      Proper Item_cache::setup() method.
      Code cleanup.
      (discussed with sanja)
      
      
      sql/item.cc:
        code cleanup
      sql/item.h:
        fix for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem.
        proper Item_cache::setup() method
        code cleanup
      sql/item_subselect.cc:
        fix for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem.
        proper Item_cache::setup() method
        code cleanup
      17e54cf4
  19. 19 Dec, 2003 2 commits
    • unknown's avatar
      THD::lex now points to THD::main_lex like in 5.0 · 8d987f9e
      unknown authored
      All tests pass (client_test included)
      
      
      libmysqld/lib_sql.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/filesort.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/ha_innodb.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/ha_myisam.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_cmpfunc.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_create.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_func.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_subselect.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_sum.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/mysql_priv.h:
        THD::lex now points to THD::main_lex like in 5.0
      sql/mysqld.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/protocol.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/repl_failsafe.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/slave.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_acl.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_base.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_cache.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_class.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_class.h:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_delete.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_error.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_insert.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_lex.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_lex.h:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_parse.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_prepare.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_repl.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_select.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_table.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_union.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_update.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_yacc.yy:
        THD::lex now points to THD::main_lex like in 5.0
      8d987f9e
    • unknown's avatar
      Fixes after merge with 4.0 · 9c2a63e3
      unknown authored
      Cleaned up embedded library access and query cache handling
      Changed min stack size to 128K (to allow longer MyISAM keys)
      Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      
      
      client/mysqldump.c:
        Fixed bugs found after merge
      include/mysql_embed.h:
        Disable query cache when using embedded version
      myisam/mi_check.c:
        Removed not used variable
      mysql-test/r/auto_increment.result:
        Fixed bugs found after merge
      mysql-test/r/bdb.result:
        Fixed bugs found after merge
      mysql-test/r/func_group.result:
        Fixed bugs found after merge
      mysql-test/r/func_str.result:
        Fixed bugs found after merge
      mysql-test/r/func_time.result:
        Fixed bugs found after merge
      mysql-test/r/group_by.result:
        Fixed bugs found after merge
      mysql-test/r/innodb.result:
        Fixed bugs found after merge
      mysql-test/r/insert.result:
        Fixed bugs found after merge
      mysql-test/r/join_outer.result:
        Fixed bugs found after merge
      mysql-test/r/loaddata.result:
        Fixed bugs found after merge
      mysql-test/r/multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/r/rpl_EE_error.result:
        Fixed bugs found after merge
      mysql-test/r/rpl_multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/symlink.result:
        Update results
      mysql-test/r/type_blob.result:
        Update results
      mysql-test/r/type_datetime.result:
        Update results
      mysql-test/r/type_decimal.result:
        Update results
      mysql-test/r/type_enum.result:
        Fixed bugs found after merge
      mysql-test/r/type_timestamp.result:
        Update results
      mysql-test/r/union.result:
        Update results
      mysql-test/r/warnings.result:
        Update results
      mysql-test/t/bdb.test:
        Fix test for 4.1
      mysql-test/t/innodb.test:
        Fix test for 4.1
      mysql-test/t/multi_update.test:
        Fix test for 4.1
      mysql-test/t/mysqldump.test:
        Fix test for 4.1
      mysql-test/t/rpl_EE_error.test:
        Fix test for 4.1
      mysql-test/t/rpl_multi_update.test:
        Fix test for 4.1
      mysql-test/t/union.test:
        Cleanup
      mysys/charset.c:
        Check results from my_once_alloc()
      mysys/my_handler.c:
        part of 4.0 merge
      sql-common/client.c:
        Part of 4.0 merge
      sql/field.cc:
        After merge fixes
      sql/field.h:
        After merge fixes
      sql/ha_innodb.cc:
        Remove duplicate include files
      sql/item.cc:
        Changed automatic int conversion to be of type binary
      sql/item.h:
        After merge fixes
      sql/item_func.cc:
        Changed automatic int conversion to be of type binary
      sql/item_func.h:
        After merge fixes
      sql/item_strfunc.cc:
        Added comments
      sql/item_subselect.cc:
        Indentation fixes
      sql/item_sum.cc:
        Changed automatic int conversion to be of type binary
      sql/item_sum.h:
        After merge fixes
      sql/mysql_priv.h:
        Cleanup embedded library access checks
      sql/mysqld.cc:
        Changed min stack size to 128K (to allow longer MyISAM keys)
      sql/set_var.cc:
        Fixed compiler warnings
      sql/share/czech/errmsg.txt:
        Better error message
      sql/share/danish/errmsg.txt:
        Better error message
      sql/share/dutch/errmsg.txt:
        Better error message
      sql/share/english/errmsg.txt:
        Better error message
      sql/share/estonian/errmsg.txt:
        Better error message
      sql/share/french/errmsg.txt:
        Better error message
      sql/share/greek/errmsg.txt:
        Better error message
      sql/share/hungarian/errmsg.txt:
        Better error message
      sql/share/italian/errmsg.txt:
        Better error message
      sql/share/japanese/errmsg.txt:
        Better error message
      sql/share/korean/errmsg.txt:
        Better error message
      sql/share/norwegian-ny/errmsg.txt:
        Better error message
      sql/share/norwegian/errmsg.txt:
        Better error message
      sql/share/polish/errmsg.txt:
        Better error message
      sql/share/romanian/errmsg.txt:
        Better error message
      sql/share/russian/errmsg.txt:
        Better error message
      sql/share/serbian/errmsg.txt:
        Better error message
      sql/share/slovak/errmsg.txt:
        Better error message
      sql/share/spanish/errmsg.txt:
        Better error message
      sql/share/swedish/errmsg.txt:
        Better error message
      sql/share/ukrainian/errmsg.txt:
        Better error message
      sql/sql_acl.h:
        Cleaned up embedded library acccess checks
      sql/sql_base.cc:
        After merge fixes
      sql/sql_client.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
        Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
        Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
      sql/sql_prepare.cc:
        Add missing arguments
      sql/sql_select.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
      sql/sql_yacc.yy:
        Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      sql/table.cc:
        After merge fixes
      9c2a63e3
  20. 10 Dec, 2003 1 commit
    • unknown's avatar
      fixed unlocking tables during subquery execution (BUG#2048) · fc75518a
      unknown authored
      mysql-test/r/subselect_innodb.result:
        bug 2048 test
      mysql-test/t/subselect_innodb.test:
        bug 2048 test
      sql/item_subselect.cc:
        do not unlock tables for subqueries
      sql/sql_derived.cc:
        derived table tables can be unlocked
      sql/sql_lex.h:
        new interface to pass additional options
      sql/sql_union.cc:
        new interface to pass additional options
        do not unlock tables for UNION
      fc75518a
  21. 06 Dec, 2003 1 commit
    • unknown's avatar
      Fix for #1992 · 859f599e
      unknown authored
      This bug happens when a query, having subselects in the fields list,
      needs temporary table.
      Item_subselect::get_tmp_table_item isn't implemented and just returns
      *this. So the tmp_table_item takes value not from temporary but
      from original table.
      
      
      mysql-test/r/subselect.result:
        appropriate test result added
      mysql-test/t/subselect.test:
        test case added
      sql/item_subselect.cc:
        Item_subselect::get_tmp_table_item implementation
      sql/item_subselect.h:
        Item_subselect::get_tmp_table_item declaration
      859f599e
  22. 28 Nov, 2003 1 commit
    • unknown's avatar
      Added missing SSL library (Should be in source distribution) · 76bf7d22
      unknown authored
      Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
      Added a lot of 'version_xxx' strings to 'show variables'
      Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
      Fixed problem with printing sub selects to debug log
      
      
      Docs/mysqld_error.txt:
        Updated error messages
      Makefile.am:
        Added missing SSL library (Should be in source distribution)
      configure.in:
        Added missing SSL library
      include/sql_common.h:
        Move duplicated prototypes
      innobase/os/os0file.c:
        Added comment for line that could be removed
      innobase/srv/srv0srv.c:
        Added comment for line that could be removed
      innobase/srv/srv0start.c:
        Added comment for line that could be removed
      innobase/trx/trx0sys.c:
        Added cast to remove compiler warning
      isam/isamchk.c:
        Fixed compiler warning
      libmysql/conf_to_src.c:
        Include files in proper order
      myisam/mi_check.c:
        Removed else part that caused compiler warning
      myisam/mi_delete.c:
        Added cast
      myisam/mi_page.c:
        Added cast
      myisam/mi_preload.c:
        Added cast
      myisam/mi_write.c:
        Added cast
      myisam/myisampack.c:
        changed 'byte' to 'current_byte' to avoid compiler warnings
      mysql-test/mysql-test-run.sh:
        Removed start-from as test '<' is not portable and this can easily be done from command line
      mysys/hash.c:
        Added cast
      mysys/mf_wcomp.c:
        Removed not reached line
      mysys/my_append.c:
        Fixed include file order to get this more portable
      mysys/my_copy.c:
        Fixed include file order to get this more portable
      mysys/my_redel.c:
        Fixed include file order to get this more portable
      sql-common/client.c:
        More DBUG_PRINT
      sql-common/pack.c:
        Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed
      sql/ha_heap.cc:
        Changed variable names to not cause hidden variables
      sql/ha_innodb.cc:
        Changed variable names to not cause hidden variables
      sql/item.cc:
        Changed variable names to not cause hidden variables
      sql/item.h:
        Changed variable names to not cause hidden variables
      sql/item_cmpfunc.h:
        Changed variable names to not cause hidden variables
      sql/item_func.cc:
        Changed variable names to not cause hidden variables
      sql/item_subselect.cc:
        Changed variable names to not cause hidden variables
      sql/item_subselect.h:
        Changed variable names to not cause hidden variables
      sql/item_sum.cc:
        Changed variable names to not cause hidden variables
      sql/item_timefunc.cc:
        Changed variable names to not cause hidden variables
      sql/log.cc:
        Changed variable names to not cause hidden variables
      sql/protocol.cc:
        Changed variable names to not cause hidden variables
      sql/protocol.h:
        Changed variable names to not cause hidden variables
        Remove function not declared in protocol.cc
      sql/protocol_cursor.cc:
        Changed variable names to not cause hidden variables
      sql/set_var.cc:
        Added a lot of 'version_xxx' strings
        Changed 'bdb_version' to 'version_bdb'
      sql/sql_class.cc:
        Changed variable names to not cause hidden variables
        Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times
      sql/sql_class.h:
        Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
      sql/sql_derived.cc:
        Avoid copying TMP_TABLE_PARAM (Use class version instead)
      sql/sql_error.cc:
        More DBUG
      sql/sql_help.cc:
        Fixed compiler warning
      sql/sql_lex.cc:
        Changed variable names to not cause hidden variables
      sql/sql_list.h:
        Changed variable names to not cause hidden variables
      sql/sql_parse.cc:
        Changed variable names to not cause hidden variables
      sql/sql_select.cc:
        Changed variable names to not cause hidden variables
        Ensure that you don't send NULL to printf() for %s
        Fixed problem with printing sub selects to debug log
      sql/sql_select.h:
        Changed variable names to not cause hidden variables
      sql/sql_union.cc:
        Changed variable names to not cause hidden variables
        Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris)
      sql/sql_update.cc:
        Indentation cleanup
      sql/sql_yacc.yy:
        Remove warning
      strings/conf_to_src.c:
        Fixed include file order
      76bf7d22
  23. 23 Nov, 2003 1 commit
    • unknown's avatar
      Fixed UNION fields type/length detecting · 3e21b667
      unknown authored
      mysql-test/r/union.result:
        new results with max union field length detecting
        type conversion tests
      mysql-test/t/union.test:
        type conversion tests
      sql/field.h:
        field converion support
      sql/item.cc:
        fixed printing field of internal temporary table of SELECT (reference from HAVING clause)
        layout fix
        new item for storing field type
      sql/item.h:
        new item for storing field type
      sql/item_subselect.cc:
        new subquery item length/dec detecting
      sql/mysql_priv.h:
        we do not need pre-inited tables and fields
      sql/sql_base.cc:
        we do not need double fix_fielding
      sql/sql_class.h:
        we do not need double fix_fielding
      sql/sql_derived.cc:
        preparing moved before temporary table creation
      sql/sql_lex.h:
        we do not need pre-inited tables and fields
        new lists to store fields types and fields of temporary table
      sql/sql_parse.cc:
        we do not need pre-inited tables and fields
      sql/sql_prepare.cc:
        we do not need pre-inited tables and fields
      sql/sql_select.cc:
        we do not need pre-inited tables and fields
        support mysql_select call from derived tables after it preparing (in derived table routing)
        support of crreating temporary table fields from Item_type_holder
      sql/sql_select.h:
        we do not need pre-inited tables and fields
      sql/sql_union.cc:
        we do not need pre-inited tables and fields
        check of columns number in union moved to prepare()
        prepering of SELECTS moved before temporary table creation, fixed union columns type/length detecting
      sql/sql_update.cc:
        we do not need pre-inited tables and fields
      3e21b667
  24. 17 Nov, 2003 1 commit
    • unknown's avatar
      fixed using 'uncachable' tag and RAND_TABLE_BIT setting · 79533975
      unknown authored
      sql/item_create.cc:
        specify cause of uncachability
      sql/item_func.cc:
        specify cause of uncachability
      sql/item_subselect.cc:
        fixed setting RAND_TABLE_BIT
        specify cause of uncachability
      sql/item_subselect.h:
        used one field for all uncachability causes
      sql/mysql_priv.h:
        causes of uncachability
      sql/sql_lex.cc:
        specify cause of uncachability
      sql/sql_lex.h:
        used one field for all uncachability causes
      sql/sql_select.cc:
        used one field for all uncachability causes
      sql/sql_union.cc:
        used one field for all uncachability causes
      sql/sql_yacc.yy:
        specify cause of uncachability
      79533975
  25. 03 Nov, 2003 1 commit
    • unknown's avatar
      after review fix · ef163ff0
      unknown authored
      mysql-test/r/func_str.result:
        new results
      sql/item.cc:
        charset changed
        printing string moved to String
      sql/item_cmpfunc.cc:
        new comparation class builder to avoid long switch
        new print_agrs used
      sql/item_cmpfunc.h:
        new comparation class builder to avoid long switch
      sql/item_func.cc:
        new print_agrs
      sql/item_func.h:
        new print_agrs
      sql/item_strfunc.cc:
        new print_agrs
      sql/item_subselect.cc:
        new comparation class builder to avoid long switch
      sql/item_subselect.h:
        new comparation class builder to avoid long switch
      sql/item_timefunc.cc:
        charset changed
      sql/mysql_priv.h:
        new comparation class builder to avoid long switch
      sql/mysqld.cc:
        new comparation class builder to avoid long switch
      sql/sql_parse.cc:
        new comparation class builder to avoid long switch
      sql/sql_string.cc:
        string printing moved to String class
      sql/sql_string.h:
        string printing moved to String class
      sql/sql_yacc.yy:
        birect class creation where it is possible
      ef163ff0
  26. 02 Nov, 2003 2 commits
    • unknown's avatar
      fixed BUG#1645 · 5fe51426
      unknown authored
        all calls of fix_fields() are inspected
      (copy of cset which I lost in accidatly tree delete)
      
      
      mysql-test/r/subselect.result:
        test of BUG#1645
      mysql-test/t/subselect.test:
        test of BUG#1645
      sql/item_subselect.cc:
        removed passing left_expr through parameters, because it present in class fields
        fixed fix_fields() call
      sql/item_subselect.h:
        removed passing left_expr through parameters, because it present in class fields
      sql/set_var.cc:
        comments added
      sql/sql_select.cc:
        fixed BUG#1645 (thd can be used in fix_fields of subqueries)
      5fe51426
    • unknown's avatar
      join_free now is method of JOIN and commented · 1e1d7b17
      unknown authored
      dependence should mean uncacheability
      
      
      sql/item_subselect.cc:
        dependence should mean uncacheability
      sql/sql_lex.cc:
        dependence should mean uncacheability
      sql/sql_select.cc:
        join_free now is method of JOIN and commented
      sql/sql_select.h:
        join_free now is method of JOIN
      1e1d7b17
  27. 01 Nov, 2003 1 commit
    • unknown's avatar
      fixed part of BUG#1708 · 1f12de84
      unknown authored
      (test suite will be with next part)
      
      
      sql/item_subselect.cc:
        fixed part of BUG#1708
      1f12de84
  28. 30 Oct, 2003 1 commit
    • unknown's avatar
      added code covarage for functions convert(), nullif(), crc32(),... · 87e6c2ba
      unknown authored
      added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
      added string length for more speed
      made code covarage for print() method of Item
      fixed printability of some items (SCRUM) (WL#1274)
      
      
      mysql-test/r/auto_increment.result:
        print() code coverage
      mysql-test/r/bench_count_distinct.result:
        print() code coverage
      mysql-test/r/case.result:
        print() code coverage
      mysql-test/r/cast.result:
        print() code coverage
      mysql-test/r/ctype_collate.result:
        print() code coverage
      mysql-test/r/ctype_many.result:
        convert with 3 arguments code covarage
        print() code coverage
      mysql-test/r/ctype_utf8.result:
        char_length code coverage
      mysql-test/r/date_formats.result:
        print() code coverage
      mysql-test/r/fulltext.result:
        print() code coverage
      mysql-test/r/func_compress.result:
        print() code coverage
      mysql-test/r/func_gconcat.result:
        print() code coverage
      mysql-test/r/func_group.result:
        bit_xor() code coverage
        print() code coverage
      mysql-test/r/func_if.result:
        nullif() code coverage
        print() code coverage
      mysql-test/r/func_in.result:
        print() code coverage
      mysql-test/r/func_math.result:
        print() code coverage
      mysql-test/r/func_op.result:
        print() code coverage
      mysql-test/r/func_regexp.result:
        print() code coverage
      mysql-test/r/func_set.result:
        print() code coverage
      mysql-test/r/func_str.result:
        crc32() code coverage
        print() code coverage
      mysql-test/r/func_system.result:
        print() code coverage
      mysql-test/r/func_test.result:
        print() code coverage
      mysql-test/r/func_time.result:
        print() code coverage
      mysql-test/r/group_by.result:
        print() code coverage
      mysql-test/r/having.result:
        print() code coverage
      mysql-test/r/insert_update.result:
        print() code coverage
      mysql-test/r/null.result:
        print() code coverage
      mysql-test/r/olap.result:
        print() code coverage
      mysql-test/r/query_cache.result:
        print() code coverage
      mysql-test/r/row.result:
        print() code coverage
      mysql-test/r/rpl000001.result:
        print() code coverage
      mysql-test/r/rpl_get_lock.result:
        print() code coverage
      mysql-test/r/rpl_master_pos_wait.result:
        print() code coverage
      mysql-test/r/select.result:
        print() code coverage
      mysql-test/r/subselect.result:
        print() code coverage
      mysql-test/r/type_blob.result:
        print() code coverage
      mysql-test/r/varbinary.result:
        print() code coverage
      mysql-test/r/variables.result:
        print() code coverage
      mysql-test/t/auto_increment.test:
        print() code coverage
      mysql-test/t/bench_count_distinct.test:
        print() code coverage
      mysql-test/t/case.test:
        print() code coverage
      mysql-test/t/cast.test:
        print() code coverage
      mysql-test/t/ctype_collate.test:
        print() code coverage
      mysql-test/t/ctype_many.test:
        convert with 3 arguments code covarage
        print() code coverage
      mysql-test/t/ctype_utf8.test:
        char_length code coverage
      mysql-test/t/date_formats.test:
        print() code coverage
      mysql-test/t/fulltext.test:
        print() code coverage
      mysql-test/t/func_compress.test:
        print() code coverage
      mysql-test/t/func_gconcat.test:
        print() code coverage
      mysql-test/t/func_group.test:
        bit_xor() code coverage
        print() code coverage
      mysql-test/t/func_if.test:
        nullif() code coverage
        print() code coverage
      mysql-test/t/func_in.test:
        print() code coverage
      mysql-test/t/func_math.test:
        print() code coverage
      mysql-test/t/func_op.test:
        print() code coverage
      mysql-test/t/func_regexp.test:
        print() code coverage
      mysql-test/t/func_set.test:
        print() code coverage
      mysql-test/t/func_str.test:
        crc32() code covarage
        print() code coverage
      mysql-test/t/func_system.test:
        print() code coverage
      mysql-test/t/func_test.test:
        print() code coverage
      mysql-test/t/func_time.test:
        print() code coverage
      mysql-test/t/group_by.test:
        print() code coverage
      mysql-test/t/having.test:
        print() code coverage
      mysql-test/t/insert_update.test:
        print() code coverage
      mysql-test/t/null.test:
        print() code coverage
      mysql-test/t/olap.test:
        print() code coverage
      mysql-test/t/query_cache.test:
        print() code coverage
      mysql-test/t/row.test:
        print() code coverage
      mysql-test/t/rpl000001.test:
        print() code coverage
      mysql-test/t/rpl_get_lock.test:
        print() code coverage
      mysql-test/t/rpl_master_pos_wait.test:
        print() code coverage
      mysql-test/t/select.test:
        print() code coverage
      mysql-test/t/type_blob.test:
        print() code coverage
      mysql-test/t/varbinary.test:
        print() code coverage
      mysql-test/t/variables.test:
        print() code coverage
      sql/item.cc:
        added string length for more speed
        layout fix
        fixed string printability
      sql/item.h:
        added string length for more speed
      sql/item_cmpfunc.cc:
        added string length for more speed
      sql/item_cmpfunc.h:
        fixed printability
      sql/item_create.cc:
        fixed printability
      sql/item_func.cc:
        fixed printability
        added string length for more speed
      sql/item_func.h:
        fixed printability
      sql/item_strfunc.cc:
        fixed printability
        added string length for more speed
      sql/item_strfunc.h:
        fixed printability
      sql/item_subselect.cc:
        added string length for more speed
      sql/item_sum.cc:
        added string length for more speed
      sql/item_timefunc.cc:
        added string length for more speed
      sql/item_timefunc.h:
        fixed printability
      sql/item_uniq.h:
        added string length for more speed
      sql/key.cc:
        added string length for more speed
      sql/sql_lex.cc:
        added string length for more speed
      sql/sql_parse.cc:
        after merge fix
      sql/sql_repl.cc:
        string changed with character for more speed
      sql/sql_select.cc:
        added string length for more speed
      sql/sql_show.cc:
        added string length for more speed
      87e6c2ba
  29. 26 Oct, 2003 1 commit
    • unknown's avatar
      fixed ALL/ANY optimisation with union (BUG#1668) · 30764334
      unknown authored
      code cleanup
      
      
      mysql-test/r/subselect.result:
        test for BUG#1668
      mysql-test/t/subselect.test:
        test for BUG#1668
      sql/item_subselect.cc:
        removed unused class field
        fixed min_max subquery used_tables()/const()
        fixed ALL/ANY optimisation for unions
      sql/item_subselect.h:
        removed unused class field
        fixed min_max subquery used_tables()/const()
      sql/sql_union.cc:
        fixed result object assignment
      30764334
  30. 23 Oct, 2003 2 commits
    • unknown's avatar
      added check of cardinality to IN/ALL/ANY subquery transformer · e5386bcb
      unknown authored
      (BUG#1638)
      
      
      mysql-test/r/subselect.result:
        test for BUG#1638
      mysql-test/t/subselect.test:
        test for BUG#1638
      sql/item_subselect.cc:
        always check cardinality first
      e5386bcb
    • unknown's avatar
      ufter review fix (BUG#1444) · d3d001fd
      unknown authored
      sql/item.cc:
        used variable to avoid using prev_unit->item which should be more clean
      sql/item_subselect.cc:
        uncachable tested on fix fields and correct bits set
      d3d001fd
  31. 19 Oct, 2003 1 commit
  32. 16 Oct, 2003 2 commits
    • unknown's avatar
      fixed support of used_tables() and const_item() in subqueries · e4b7aaac
      unknown authored
      (BUG#1444)
      
      
      mysql-test/r/subselect.result:
        BUG#1444 test
      mysql-test/t/subselect.test:
        BUG#1444 test
      sql/item.cc:
        storing used tables in Item_subselect
      sql/item_subselect.cc:
        fixed support of used_tables() and const_item() in subqueries
      sql/item_subselect.h:
        fixed support of used_tables() and const_item() in subqueries
      e4b7aaac
    • unknown's avatar
      subqueries made printable · 724a6c3c
      unknown authored
      new EXPLAIN parameter to show real query as it was interpreted
      (SCRUM) (WL#1274)
      
      
      mysql-test/r/subselect.result:
        new explains
      mysql-test/r/union.result:
        new explains
      mysql-test/t/subselect.test:
        new explains
      mysql-test/t/union.test:
        new explains
      sql/item.cc:
        fixed printability of Items in SELECT list
      sql/item.h:
        fixed printability of Items in SELECT list
      sql/item_cmpfunc.cc:
        fixed print()
      sql/item_cmpfunc.h:
        fixed print()
      sql/item_subselect.cc:
        subqueries made printable
      sql/item_subselect.h:
        subqueries made printable
      sql/mysql_priv.h:
        union option made looks like options
      sql/sql_derived.cc:
        now this link is used
      sql/sql_lex.cc:
        subqueries made printable
      sql/sql_lex.h:
        subqueries made printable
        new EXPLAIN parameter support
      sql/sql_parse.cc:
        new EXPLAIN parameter
      sql/sql_select.cc:
        debug output
        new EXPLAIN parameter support
      sql/sql_select.h:
        new EXPLAIN parameter support
      sql/sql_yacc.yy:
        new EXPLAIN parameter support
        SELECT printability support
      724a6c3c
  33. 08 Oct, 2003 1 commit
    • unknown's avatar
      Fixes after merge · 1ead85e6
      unknown authored
      mysql-test/std_data/trunc_binlog.000001:
        Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
      client/mysqltest.c:
        Fixed merge problem
      mysql-test/mysql-test-run.sh:
        Fixed merge problem
      mysql-test/r/distinct.result:
        Fix after merge
      mysql-test/r/drop_temp_table.result:
        Fix after merge
      mysql-test/r/join_outer.result:
        Fix after merge
      mysql-test/r/mysqldump.result:
        Fix after merge
      mysql-test/r/null_key.result:
        Fix after merge
      mysql-test/r/order_by.result:
        Fix after merge
      mysql-test/r/rpl_alter.result:
        Fix after merge
      mysql-test/r/rpl_loaddata.result:
        Fix after merge
      mysql-test/r/rpl_loaddata_rule_m.result:
        Fix after merge
      mysql-test/r/rpl_trunc_binlog.result:
        Fix after merge
      mysql-test/r/select_safe.result:
        Fix after merge
      mysql-test/t/insert.test:
        Fix after merge
      mysql-test/t/mysqlbinlog.test:
        Fix after merge
      mysql-test/t/rpl000009.test:
        Fix after merge
      mysql-test/t/rpl_alter.test:
        Fix after merge
      mysql-test/t/rpl_loaddata_rule_m.test:
        Fix after merge
      mysql-test/t/rpl_trunc_binlog.test:
        Fix after merge
      sql-common/client.c:
        Fix after merge
      sql/item_subselect.cc:
        Fix after merge
      sql/repl_failsafe.cc:
        Fix after merge
      sql/slave.cc:
        Fix after merge
      sql/sql_insert.cc:
        Fix after merge
      1ead85e6
  34. 07 Oct, 2003 3 commits