1. 17 Nov, 2003 2 commits
  2. 15 Nov, 2003 1 commit
    • unknown's avatar
      fixed error handling inside su_select() for multidelete · c7e9ef27
      unknown authored
      (BUG#1839)
      
      
      mysql-test/r/subselect.result:
        test case for BUG#1839
      mysql-test/t/subselect.test:
        test case for BUG#1839
      sql/sql_select.cc:
        check of errors inside sub_select to prevent deleting rows in case of errors
      c7e9ef27
  3. 13 Nov, 2003 2 commits
  4. 12 Nov, 2003 3 commits
  5. 08 Nov, 2003 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1ac15163
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      1ac15163
    • unknown's avatar
      fulltext.test, fulltext.result, ft_nlq_search.c: · 74c8f26c
      unknown authored
        a bug in latin1_german2 FT fixed
      
      
      myisam/ft_nlq_search.c:
        a bug in latin1_german2 FT fixed
      mysql-test/r/fulltext.result:
        a bug in latin1_german2 FT fixed
      mysql-test/t/fulltext.test:
        a bug in latin1_german2 FT fixed
      74c8f26c
  6. 07 Nov, 2003 2 commits
    • unknown's avatar
      fixed layout · 0a68f011
      unknown authored
      0a68f011
    • unknown's avatar
      sunstring_index() code covarage · bc675e66
      unknown authored
      print() method code covarage for some string function which I lost last time
      
      
      mysql-test/r/func_crypt.result:
        print() method code covarage
      mysql-test/r/func_encrypt.result:
        print() method code covarage
      mysql-test/r/func_str.result:
        sunstring_index() code covarage
        print() method code covarage
      mysql-test/t/func_crypt.test:
        print() method code covarage
      mysql-test/t/func_encrypt.test:
        print() method code covarage
      mysql-test/t/func_str.test:
        sunstring_index() code covarage
        print() method code covarage
      bc675e66
  7. 06 Nov, 2003 1 commit
    • unknown's avatar
      fixed printability of gis functions · 46032c09
      unknown authored
      code covarage for srid, GeomFromText with 2 parameters
      code covarage foe print() method of gis functions
      
      
      mysql-test/r/gis.result:
        code covarage for srid, GeomFromText with 2 parameters
        code covarage foe print() method of gis functions
      mysql-test/t/gis.test:
        code covarage for srid, GeomFromText with 2 parameters
        code covarage foe print() method of gis functions
        + commented test for issimple() (bugreport sent)
      sql/item_geofunc.h:
        fixed printability of gis functions
      46032c09
  8. 05 Nov, 2003 4 commits
  9. 04 Nov, 2003 20 commits
    • unknown's avatar
      Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 48d4f24c
      unknown authored
      into mysql.com:/home/walrus/bk/41
      
      48d4f24c
    • unknown's avatar
      compile-pentium-gcov: · bd7da8ec
      unknown authored
        Stop line wrapping for compiler warnings.
        It needs for warnings statistic in code coverage
      
      
      BUILD/compile-pentium-gcov:
        Stop line wrapping for compiler warnings.
        It needs for warnings statistic in code coverage
      bd7da8ec
    • unknown's avatar
      fixed: · 08014c61
      unknown authored
      ==2761== Thread 10:
      ==2761== Conditional jump or move depends on uninitialised value(s)
      ==2761==    at 0x8115FD2: Item_func_uncompressed_length::val_int() (sql_string.h:90)
      ==2761==    by 0x8105658: Arg_comparator::compare_int() (item_cmpfunc.cc:356)
      and
      ==2761== Thread 10:
      ==2761== Conditional jump or move depends on uninitialised value(s)
      ==2761==    at 0x8116101: Item_func_compress::val_str(String*) (sql_string.h:90)
      ==2761==    by 0x80E9193: Item::save_in_field(Field*, bool) (item.cc:1155)
      
      
      sql/item_strfunc.cc:
        ptr() is used instead of c_ptr(), because it is safe enough, more efficient and do not confuse valgrind
      08014c61
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · fd04b425
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      fd04b425
    • unknown's avatar
      fixed: · 506788be
      unknown authored
      ==2761== Thread 10:
      ==2761== Conditional jump or move depends on uninitialised value(s)
      ==2761==    at 0x81913BB: find_best(JOIN*, unsigned long long, unsigned, double, double) (sql_select.cc:2689)
      ==2761==    by 0x8191030: find_best_combination(JOIN*, unsigned long long) (sql_select.cc:2599)
      
      
      sql/sql_select.cc:
        keypart_map fiels should be initialized in case of fulltext index
      506788be
    • unknown's avatar
      fixed: · 079d1e13
      unknown authored
      ==2761== Thread 10:
      ==2761== Conditional jump or move depends on uninitialised value(s)
      ==2761==    at 0x818F580: make_join_statistics(JOIN*, st_table_list*, Item*, st_dynamic_array*) (sql_select.cc:1850)
      ==2761==    by 0x818B705: JOIN::optimize() (sql_select.cc:578)
      
      
      sql/sql_select.cc:
        optimize field should be initialized in case of fulltext index
      079d1e13
    • unknown's avatar
      Removed trailing blank lines in some errmsg.txt files, as it counts · 57035bd4
      unknown authored
      as an error message (which is harmless, but confusing when you
      compare the output from comp_err for different language files).
      
      
      sql/share/italian/errmsg.txt:
        Removed trailing blank line as it counts as an error message
        (which is harmless, but confusing when you compare the output
        from comp_err for different language files).
      sql/share/korean/errmsg.txt:
        Removed trailing blank line as it counts as an error message
        (which is harmless, but confusing when you compare the output
        from comp_err for different language files).
      sql/share/norwegian/errmsg.txt:
        Removed trailing blank line as it counts as an error message
        (which is harmless, but confusing when you compare the output
        from comp_err for different language files).
      57035bd4
    • unknown's avatar
      ut0dbg.h, ut0dbg.c: · 93952390
      unknown authored
        Marko's patch to ut_a() fputs
      
      
      innobase/ut/ut0dbg.c:
        Marko's patch to ut_a() fputs
      innobase/include/ut0dbg.h:
        Marko's patch to ut_a() fputs
      93952390
    • unknown's avatar
      Fix for memory overlap in rt_split.c (reported by valgrind) · bc1d66c5
      unknown authored
      
      myisam/rt_split.c:
        Prevent memcpy if source and destination are same
      bc1d66c5
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2df647f3
      unknown authored
      into deer.(none):/home/ram/work/4.1
      
      2df647f3
    • unknown's avatar
      fix for r-tree code (memory overlap reported by valgrind) · 87b36216
      unknown authored
      new comments.
      
      
      myisam/mi_open.c:
        fix for r-tree code (memory overlap reported by valgrind)
      myisam/myisamdef.h:
        fix for r-tree code (memory overlap reported by valgrind)
      myisam/rt_index.c:
        fix for r-tree code (memory overlap reported by valgrind)
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      87b36216
    • unknown's avatar
      Fixed access to uninitialized memory in protocol::store_time · 5a2e8356
      unknown authored
      
      BUILD/compile-pentium-valgrind-max:
        New attempt to avoid multiple warning
      mysql-test/mysql-test-run.sh:
        --valgrind-all now automaticly enables valgrind
      5a2e8356
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · efb99e73
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      efb99e73
    • unknown's avatar
      Removed some warnings reported by valgrind · 3b0d8e16
      unknown authored
      After merge fixes.
      Now code compiles, but there is still some valgrind warnings that needs to be fixed
      
      
      myisam/mi_rnext_same.c:
        handle case where rtree_find_next() returns an error
        (assume this means that there was no more keys)
      myisam/rt_index.c:
        Code cleanup
      mysql-test/r/func_crypt.result:
        Update results
      mysql-test/r/func_group.result:
        Update results
      mysql-test/r/null_key.result:
        Update results
      mysql-test/r/order_by.result:
        Update results
      mysql-test/r/query_cache.result:
        Update results
      mysql-test/r/range.result:
        Update results
      mysql-test/r/rpl_trunc_binlog.result:
        Update results
      mysql-test/t/fulltext.test:
        Fix error numbers
      mysql-test/t/func_crypt.test:
        Fixed test for 4.1
      mysql-test/t/range.test:
        Moved tests to be in sync with 4.0
      mysys/test_charset.c:
        Removed acccess to non existing functions
      sql-common/client.c:
        Merge fix
      sql/item_strfunc.cc:
        Simple code cleanup
        Don't call ->c_ptr() when you don't need a 0 terminated string
        (Causes warnings from valgrind)
      sql/log_event.cc:
        After merge fixes
      sql/protocol.cc:
        Change default catalog name to 'def'
      sql/spatial.cc:
        Code cleanup
      sql/sql_class.cc:
        After merge fixes
      sql/time.cc:
        Ensure that time object is cleared on error
      sql/unireg.cc:
        Removed warning reported by valgrind
      3b0d8e16
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · e678d1df
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      e678d1df
    • unknown's avatar
      avoid problem when all tables are const · 10eaa32a
      unknown authored
      10eaa32a
    • unknown's avatar
      avoid problem when all tables are const · c3acf470
      unknown authored
      c3acf470
    • unknown's avatar
      fixed problem with UNION flags · 2406f38f
      unknown authored
      
      sql/sql_lex.h:
        removed unused flag
      sql/sql_union.cc:
        correct flag used
      2406f38f
    • unknown's avatar
      avoid writting junk · 6b765550
      unknown authored
      6b765550
    • unknown's avatar
      Merge with 4.0 · 54ef6c31
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-apply-patch:
        Delete: netware/BUILD/apply-patch
      BitKeeper/deleted/.del-save-patch:
        Delete: netware/BUILD/save-patch
      BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
        Auto merged
      BitKeeper/triggers/post-commit:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/include/os0thread.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/thr/thr0loc.c:
        Auto merged
      libmysql/manager.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/mi_extra.c:
        Auto merged
      myisam/mi_locking.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_trunc_binlog.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      mysys/errors.c:
        Auto merged
      mysys/my_symlink.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      client/mysqldump.c:
        merge with 4.0 (quoted names)
      configure.in:
        use local file
      include/my_pthread.h:
        Use local file
      innobase/include/srv0srv.h:
        Use local file
      innobase/row/row0sel.c:
        Use local file
      innobase/srv/srv0srv.c:
        Use local file
      libmysql/libmysql.c:
        Use local file
      myisam/myisamchk.c:
        merge fixes
      mysql-test/r/func_crypt.result:
        update results
      mysql-test/r/order_by.result:
        update results
      mysql-test/r/query_cache.result:
        update results
      mysql-test/r/range.result:
        update results
      mysql-test/r/rpl_reset_slave.result:
        update results
      mysql-test/r/rpl_trunc_binlog.result:
        update results
      mysql-test/t/func_crypt.test:
        Added disable_warnings/enable warnings
      mysql-test/t/query_cache.test:
        merge tests
      mysql-test/t/range.test:
        merge tests
      mysys/charset.c:
        use local file (will merge patch separately)
      sql/ha_innodb.cc:
        use local file
      sql/log_event.cc:
        new slave_proxy_id handling
      sql/slave.h:
        merge
      sql/sql_base.cc:
        merge
      sql/sql_parse.cc:
        Fixes for counting user connect resourses
        Added function comments for involved functions
      sql/sql_select.cc:
        Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used
      sql/unireg.cc:
        merge fixes
      support-files/mysql.server.sh:
        merge fixes
      54ef6c31
  10. 03 Nov, 2003 3 commits