1. 28 Aug, 2003 1 commit
    • unknown's avatar
      reset() split in 2 function clear() & add() · 85f7a697
      unknown authored
      aggregate function reinitialization (if no rows was found) made with help of clear()
      (fixed BUG#860)
      
      
      mysql-test/r/subselect.result:
        test for BUG#860
      mysql-test/t/subselect.test:
        test for BUG#860
      sql/item_sum.cc:
        reset() replaced with clear()
      sql/item_sum.h:
        reset() replaced with clear()
        (reset now is just composition of clear() and add())
      sql/item_uniq.h:
        reset() replaced with clear()
      sql/sql_select.cc:
        removed NULL value assigment, now it will be done by clear() call
        function for clearing if there was not found any row in group
      sql/sql_select.h:
        function for clearing if there was not found any row in group
      85f7a697
  2. 27 Aug, 2003 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c2d54add
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      c2d54add
    • unknown's avatar
      hanged UDF interface to use clear() instead of reset() · 0ee6f7fd
      unknown authored
      
      BUILD/FINISH.sh:
        Add just_clean option (for cleanup script)
      scripts/mysql_fix_privilege_tables.sql:
        Added 'USE mysql' for easer use on windows
      sql/item_sum.cc:
        Changed UDF interface to use clear() instead of reset()
      sql/item_sum.h:
        Changed UDF interface to use clear() instead of reset()
      sql/slave.cc:
        Fixed checking of eof for slave/master protocol. (Bug #887)
      sql/sql_udf.cc:
        Changed UDF interface to use clear() instead of reset()
      sql/sql_udf.h:
        Changed UDF interface to use clear() instead of reset()
      sql/sql_yacc.yy:
        ERRORS and WARNINGS should not be reserved words
      sql/udf_example.cc:
        Changed UDF interface to use clear() instead of reset()
      0ee6f7fd
    • unknown's avatar
      Merge fixes · cd822e34
      unknown authored
      
      sql/sql_union.cc:
        Some further merge fixes
      cd822e34
    • unknown's avatar
      sql_union.cc: · 8a920b61
      unknown authored
        Post merge fixes
      
      
      sql/sql_union.cc:
        Post merge fixes
      8a920b61
    • unknown's avatar
      merge fixes · 8a6f8201
      unknown authored
      
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      8a6f8201
  3. 26 Aug, 2003 5 commits
  4. 25 Aug, 2003 2 commits
  5. 23 Aug, 2003 1 commit
    • unknown's avatar
      union.result: · c64d2b6f
      unknown authored
        same as above
      sql_lex.h:
        same as above 
      sql_union.cc:
        same as aobve
      sql_select.cc:
        Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
        Plus updating some fields in THD in the proper places 
        plus fixing a wrong result
      
      
      sql/sql_select.cc:
        Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
        Plus updating some fields in THD in the proper places 
        plus fixing a wrong result
      sql/sql_union.cc:
        same as aobve
      sql/sql_lex.h:
        same as above
      mysql-test/r/union.result:
        same as above
      c64d2b6f
  6. 21 Aug, 2003 1 commit
  7. 20 Aug, 2003 8 commits
    • unknown's avatar
      merge · 78f54936
      unknown authored
      
      mysql-test/r/subselect.result:
        correct result after merging with fixed Item_in_optimiser::fix_left()
      mysql-test/t/subselect.test:
        error code changed
      78f54936
    • unknown's avatar
      merge · 97ee3f15
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      97ee3f15
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 8359a2c7
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
      
      
      8359a2c7
    • unknown's avatar
      quick fix for found row counter · 94d018c2
      unknown authored
      code cleunup
      
      
      sql/sql_class.h:
        removed unused variables
      sql/sql_union.cc:
        quick fix for found row counter
        layout fixed
      sql/sql_update.cc:
        lelect_limit in THD is not used
      94d018c2
    • unknown's avatar
      Merge · 6ec43a9d
      unknown authored
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_union.cc:
        SCCS merged
      6ec43a9d
    • unknown's avatar
      - make sure that both libedit and readline are added to the source · 0e34c128
      unknown authored
         distribution. libedit is used by default, one needs to use
         "--with-readline" when compiling with readline instead.
      
      
      cmd-line-utils/Makefile.am:
         - add both libedit and readline to the source distribution
      configure.in:
         - create both Makefiles for libedit and libedit
      0e34c128
    • unknown's avatar
      after merge changing · 5e00fc02
      unknown authored
      uninitialized value fixed
      
      
      sql/item_cmpfunc.cc:
        fixed uninitialized used_tables_cache
        othyer caches moved on proper place
      sql/item_subselect.cc:
        fixed reported table bit
      sql/mysql_priv.h:
        after merge chenges.
      sql/sql_parse.cc:
        used same new operator for all allocation in subroutine
      sql/sql_union.cc:
        fake st_select_lex should have item list for ref_array allocation
      sql/sql_yacc.yy:
        after merge changing
      5e00fc02
    • unknown's avatar
      fixing limit and SQL_CALC_FOUND_ROWS issues · a2152385
      unknown authored
      a2152385
  8. 19 Aug, 2003 6 commits
    • unknown's avatar
      merge · 6d0a0487
      unknown authored
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      6d0a0487
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · d3727c2c
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      d3727c2c
    • unknown's avatar
      A fix for a bug with long definition of SET or ENUM. · 651ead1a
      unknown authored
      Barkov approved it already
      
      
      
      651ead1a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 513917a5
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      
      include/m_ctype.h:
        Auto merged
      513917a5
    • unknown's avatar
      After merge fixes + bugs from last merge · aa900a5e
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Use --skip-bdb with valgrind (as bdb tables causes valgrind to hang)
        Fix --ddd option
      mysql-test/t/union.test:
        After merge fix
      sql/item.cc:
        Fixed typo
      sql/log_event.cc:
        Move current_tablenr to open_tables()
      sql/protocol.h:
        Fixed wrong memory reference
      sql/set_var.cc:
        After merge fix
      sql/slave.cc:
        Reset thd->lex.current_select before execute
      sql/sql_base.cc:
        Move current_tablenr to open_tables()
      sql/sql_class.cc:
        Move current_tablenr to open_tables()
        Add missing update_charset()
      sql/sql_parse.cc:
        Move current_tablenr to open_tables()
        Simple cleanup
      sql/table.cc:
        Code cleanup
      aa900a5e
    • unknown's avatar
      Removed idle MY_LEX_SIGNED_NUMBER · 27ea24b4
      unknown authored
      27ea24b4
  9. 18 Aug, 2003 4 commits
    • unknown's avatar
      merge · 755e72a0
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      755e72a0
    • unknown's avatar
      After merge fixes · 2901c3b8
      unknown authored
      Use server character set if --default-character-set is not used
      Added convert_string() for more efficient alloc+character-set convert of strings
      
      
      BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9:
        Delete: mysql-test/r/convert.result
      BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
        Delete: mysql-test/t/convert.test
      BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b:
        Delete: scripts/make_win_src_distribution.old
      client/mysql.cc:
        Use server character set if --default-character-set is not used
      client/mysqltest.c:
        Code cleanup (merge identical code)
        More debug messages
      heap/hp_create.c:
        After merge fix
      include/m_ctype.h:
        After merge fix
      include/my_global.h:
        Remove size_str (we already have size_s)
      include/mysql_com.h:
        After merge fix
      libmysql/libmysql.c:
        After merge fix
      libmysqld/Makefile.am:
        After merge fix
      mysql-test/r/auto_increment.result:
        After merge fix
      mysql-test/r/create.result:
        After merge fix
      mysql-test/r/ctype_latin1_de.result:
        After merge fix
      mysql-test/r/distinct.result:
        After merge fix
      mysql-test/r/drop.result:
        After merge fix
      mysql-test/r/fulltext.result:
        After merge fix
      mysql-test/r/func_gconcat.result:
        After merge fix
      mysql-test/r/func_str.result:
        After merge fix
      mysql-test/r/func_test.result:
        After merge fix
      mysql-test/r/grant.result:
        After merge fix
      mysql-test/r/group_by.result:
        After merge fix
      mysql-test/r/handler.result:
        After merge fix
      mysql-test/r/heap.result:
        After merge fix
      mysql-test/r/heap_btree.result:
        After merge fix
      mysql-test/r/heap_hash.result:
        After merge fix
      mysql-test/r/innodb.result:
        After merge fix
      mysql-test/r/insert.result:
        After merge fix
      mysql-test/r/insert_select.result:
        After merge fix
      mysql-test/r/join_outer.result:
        After merge fix
      mysql-test/r/key.result:
        After merge fix
      mysql-test/r/key_cache.result:
        After merge fix
      mysql-test/r/loaddata.result:
        After merge fix
      mysql-test/r/myisam.result:
        After merge fix
      mysql-test/r/null.result:
        After merge fix
      mysql-test/r/null_key.result:
        After merge fix
      mysql-test/r/order_by.result:
        After merge fix
      mysql-test/r/rpl_do_grant.result:
        After merge fix
      mysql-test/r/rpl_error_ignored_table.result:
        After merge fix
      mysql-test/r/rpl_ignore_grant.result:
        After merge fix
      mysql-test/r/rpl_loaddata.result:
        After merge fix
      mysql-test/r/rpl_log.result:
        After merge fix
      mysql-test/r/rpl_log_pos.result:
        After merge fix
      mysql-test/r/rpl_max_relay_size.result:
        After merge fix
      mysql-test/r/rpl_replicate_do.result:
        After merge fix
      mysql-test/r/rpl_reset_slave.result:
        After merge fix
      mysql-test/r/rpl_rotate_logs.result:
        After merge fix
      mysql-test/r/rpl_user_variables.result:
        After merge fix
      mysql-test/r/select.result:
        After merge fix
      mysql-test/r/select_safe.result:
        After merge fix
      mysql-test/r/subselect.result:
        After merge fix
      mysql-test/r/type_blob.result:
        After merge fix
      mysql-test/r/type_decimal.result:
        After merge fix
      mysql-test/r/type_float.result:
        After merge fix
      mysql-test/r/type_ranges.result:
        After merge fix
      mysql-test/r/type_time.result:
        After merge fix
      mysql-test/r/type_uint.result:
        After merge fix
      mysql-test/r/union.result:
        After merge fix
      mysql-test/r/warnings.result:
        After merge fix
      mysql-test/t/auto_increment.test:
        After merge fix
      mysql-test/t/case.test:
        After merge fix
      mysql-test/t/ctype_collate.test:
        After merge fix
      mysql-test/t/ctype_latin1_de.test:
        After merge fix
      mysql-test/t/drop.test:
        After merge fix
      mysql-test/t/func_in.test:
        After merge fix
      mysql-test/t/func_set.test:
        After merge fix
      mysql-test/t/func_str.test:
        After merge fix
      mysql-test/t/func_test.test:
        After merge fix
      mysql-test/t/grant.test:
        After merge fix
      mysql-test/t/group_by.test:
        After merge fix
      mysql-test/t/handler.test:
        After merge fix
      mysql-test/t/heap.test:
        After merge fix
      mysql-test/t/heap_btree.test:
        After merge fix
      mysql-test/t/heap_hash.test:
        After merge fix
      mysql-test/t/innodb.test:
        After merge fix
      mysql-test/t/insert_select.test:
        After merge fix
      mysql-test/t/key.test:
        After merge fix
      mysql-test/t/key_cache.test:
        After merge fix
      mysql-test/t/lock_tables_lost_commit-master.opt:
        After merge fix
      mysql-test/t/lock_tables_lost_commit.test:
        After merge fix
      mysql-test/t/myisam.test:
        After merge fix
      mysql-test/t/row.test:
        After merge fix
      mysql-test/t/subselect.test:
        After merge fix
      mysql-test/t/type_decimal.test:
        After merge fix
      mysql-test/t/type_ranges.test:
        After merge fix
      mysql-test/t/type_uint.test:
        After merge fix
      mysql-test/t/variables.test:
        After merge fix
      mysql-test/t/warnings.test:
        After merge fix
      scripts/make_win_src_distribution.sh:
        after merge fixes
      sql-common/client.c:
        After merge fix
        Change my_connect() to use poll()
        If character set is not given, use servers character set.
      sql/field.cc:
        After merge fix
        Don't give warnings when storing data in fields in optimizer.
      sql/ha_myisammrg.h:
        After merge fix
      sql/log.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix
      sql/mysqld.cc:
        After merge fix
      sql/opt_range.cc:
        After merge fix
      sql/set_var.cc:
        Code cleanup
        Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
      sql/set_var.h:
        Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
      sql/slave.cc:
        After merge fix
      sql/sql_acl.cc:
        After merge fix
        Code cleanup
      sql/sql_class.cc:
        Added convert_string() for more efficient alloc+character-set convert of strings
        Add cached flags to avoid calling mysql_charset_same() during parsing.
      sql/sql_class.h:
        Added convert_string() for more efficient alloc+character-set convert of strings
        Add cached flags to avoid calling mysql_charset_same() during parsing.
      sql/sql_handler.cc:
        After merge fix
      sql/sql_lex.h:
        After merge fix
      sql/sql_parse.cc:
        Optimize and fix memory reference errors reported by valgrind
      sql/sql_repl.cc:
        After merge fix
      sql/sql_yacc.yy:
        After merge fix
        Avoid calling mysql_charset_same() when parsing identifiers
      strings/ctype-latin1.c:
        Port latin_de conversion code from 4.0
      2901c3b8
    • unknown's avatar
      Adding Gerogian GEOSTD8 character set · a7c82c56
      unknown authored
      a7c82c56
    • unknown's avatar
  10. 16 Aug, 2003 1 commit
    • unknown's avatar
      Code cleanup · 3808546d
      unknown authored
      
      sql/item.cc:
        As far as now transformer called after setup_wild() it is impossible to have '*' Item
      sql/item.h:
        As far as now transformer called after setup_wild() it is impossible to have '*' Item
      sql/item_subselect.cc:
        replaced Item_ref_on_list_position (which need erly ref_array initialisation)
      sql/mysql_priv.h:
        setup_ref_array moved to st_select_lex class
      sql/sql_delete.cc:
        setup_ref_array moved to st_select_lex class
      sql/sql_derived.cc:
        setup_ref_array moved to st_select_lex class
      sql/sql_lex.cc:
        removed double initialisation
        select_n_having_items moved to any query initializations, because it used in setup_ref_array method
        setup_ref_array moved to st_select_lex class
      sql/sql_lex.h:
        setup_ref_array moved to st_select_lex class
      sql/sql_select.cc:
        setup_ref_array moved to st_select_lex class
      sql/sql_table.cc:
        setup_ref_array moved to st_select_lex class
      sql/sql_union.cc:
        setup_ref_array moved to st_select_lex class
      sql/sql_update.cc:
        setup_ref_array moved to st_select_lex class
      3808546d
  11. 15 Aug, 2003 1 commit
  12. 14 Aug, 2003 1 commit
    • unknown's avatar
      added compile-pentium-maintainer - · 95728904
      unknown authored
      equivalent of compile-pentium-debug but with
      --enable-maintainer-mode configure option
      Maybe it's worth to merge compile-mentium-debug
      and compile-pentium-maintainer to a single script
      
      
      95728904
  13. 13 Aug, 2003 1 commit
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 2f27bbd9
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      2f27bbd9
  14. 12 Aug, 2003 3 commits