1. 18 Nov, 2003 7 commits
    • unknown's avatar
      Merge with 4.0 tree · 65b3e772
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      scripts/Makefile.am:
        Auto merged
      scripts/mysql_config.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
        Auto merged
      BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
        Auto merged
      BUILD/compile-pentium-gcov:
        merge
      myisam/mi_test2.c:
        use original code
      mysql-test/t/range.test:
        Fixed comment
      mysys/mf_keycache.c:
        Fixed comments
      65b3e772
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b128dad8
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      b128dad8
    • unknown's avatar
      Delete duplicate error message names · 8a2a03fd
      unknown authored
      
      include/mysqld_error.h:
        Delete duplicate error names
      include/sql_state.h:
        Delete duplicate error names
      myisam/ft_dump.c:
        Delete wrong patch
      myisam/myisamchk.c:
        Delete wrong patch
      mysql-test/r/query_cache.result:
        Fix after deleting duplicated error messages
      mysql-test/t/create.test:
        Fix after deleting duplicated error messages
      mysql-test/t/fulltext.test:
        Fix after deleting duplicated error messages
      mysql-test/t/key_cache.test:
        Fix after deleting duplicated error messages
      sql/share/czech/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/danish/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/dutch/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/english/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/estonian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/french/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/german/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/greek/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/hungarian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/italian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/japanese/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/korean/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/norwegian-ny/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/norwegian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/polish/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/portuguese/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/romanian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/russian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/serbian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/slovak/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/spanish/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/swedish/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/share/ukrainian/errmsg.txt:
        Fix after deleting duplicated error messages
      sql/sql_db.cc:
        Fix after deleting duplicated error messages
      sql/sql_parse.cc:
        Fix after deleting duplicated error messages
      sql/sql_table.cc:
        Fix after deleting duplicated error messages
      tests/client_test.c:
        CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
      8a2a03fd
    • unknown's avatar
      Fix for bug #1820 · 9917ab32
      unknown authored
      
      mysql-test/r/multi_update.result:
        Test for bug #1820
      mysql-test/t/multi_update.test:
        Test for bug #1820
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      9917ab32
    • unknown's avatar
      merge · ce92b1bc
      unknown authored
      
      myisam/ft_nlq_search.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/serbian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      ce92b1bc
    • unknown's avatar
      CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS · 1b739e39
      unknown authored
      New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
      ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
      (One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
      Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
      New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
      Removed compiler warnings
      Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
      
      
      BUILD/compile-pentium-valgrind-max:
        Add test of isam
      client/mysql.cc:
        CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
      include/my_base.h:
        Remove HA_EXTRA_SET_KEY_CACHE
      include/my_no_pthread.h:
        Add defines to ignore rw-locks when running without threads
      include/my_sys.h:
        Added function for multi-key-caches
      include/myisam.h:
        Added function to handle multi-key-caches
      include/mysql.h:
        Added mysql_set_server_option
      include/mysql_com.h:
        CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
        Added enum_mysql_set_option
      include/mysqld_error.h:
        Added error message for unknown key cache
      innobase/srv/srv0start.c:
        Removed warning that is confused for MySQL users
      libmysql/libmysql.c:
        Added mysql_set_server_option()
      libmysql/libmysql.def:
        Added mysql_set_server_option()
      myisam/ft_nlq_search.c:
        Removed compiler warning
      myisam/ft_static.c:
        Removed compiler warning and fixed wrong return value
      myisam/mi_check.c:
        Clean up multi-key-cache usage
      myisam/mi_checksum.c:
        Removed not used variable
      myisam/mi_close.c:
        keycache -> key_cache
      myisam/mi_delete_all.c:
        keycache -> key_cache
      myisam/mi_extra.c:
        keycache -> key_cache
        Removed HA_EXTRA_SET_KEY_CACHE
      myisam/mi_keycache.c:
        Changed logic so that it's MyISAM that is responsible for assign tables to different key caches instead of the upper level
      myisam/mi_locking.c:
        Don't change key cache on unlock (must be done before)
      myisam/mi_open.c:
        Fetch key cache to use from multi_key_cache_search()
      myisam/mi_page.c:
        keycache -> key_cache
      myisam/mi_panic.c:
        keycache -> key_cache
      myisam/mi_preload.c:
        keycache -> key_cache
      myisam/mi_test1.c:
        Use KEY_CACHE_BLOCK_SIZE
      myisam/mi_test2.c:
        Always test resize_key_cache()
      myisam/mi_test3.c:
        Use KEY_CACHE_BLOCK_SIZE instead of 512
      myisam/myisamchk.c:
        update for multiple key caches
      myisam/myisamdef.h:
        Remove reg_keycache
        Add unique_name_length for storing length of unique_file_name
      myisam/myisamlog.c:
        Change how end_key_cache() is called
      mysql-test/mysql-test-run.sh:
        Fixed web link
        Added name of failed test to abort row.
      mysql-test/r/alter_table.result:
        Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET
      mysql-test/r/case.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/cast.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/create.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/ctype_collate.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/ctype_latin1_de.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/ctype_many.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/ctype_mb.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/ctype_recoding.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/ctype_ucs.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/derived.result:
        Use STRAIGHT_JOIN to make join order predictable
      mysql-test/r/fulltext.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/func_str.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/func_system.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/gis-rtree.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/innodb.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/key_cache.result:
        Update test for new key cache syntax.
        Added more tests
      mysql-test/r/merge.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/preload.result:
        New syntax
      mysql-test/r/show_check.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/sql_mode.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/subselect.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/type_blob.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/type_enum.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/type_nchar.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/type_set.result:
        Update result for DEFAULT CHARSET...
      mysql-test/r/union.result:
        Use STRAIGHT_JOIN to make join order predictable
      mysql-test/t/alter_table.test:
        Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET
      mysql-test/t/ctype_many.test:
        Update result for DEFAULT CHARSET...
      mysql-test/t/derived.test:
        Use STRAIGHT_JOIN to make join order predictable
      mysql-test/t/isam.test:
        Use disable warnings for test loop
      mysql-test/t/join.test:
        Update test now when we only support 61 tables in join
      mysql-test/t/key_cache.test:
        Update test for new key cache syntax.
        Added more tests
      mysql-test/t/preload.test:
        Update for new syntax
      mysql-test/t/union.test:
        Use STRAIGHT_JOIN to make join order predictable
      mysys/Makefile.am:
        Added mf_keycaches.c
      mysys/hash.c:
        TRUE -> 1
      mysys/mf_keycache.c:
        Removed compiler warnings
        Striped end space
        Fixed indentation and improved function comments
        TRUE -> 1
        Changed parameters to end_key_cache() to make it easer to use
        Fixed bug when using key blocks size > 1024 bytes (First part of index file could be overwritten with wrong data)
        Split function flush_key_blocks into two functions to not get mutex used twice when called from flush_all_key_blocks()
      mysys/my_bitmap.c:
        More debugging
        Safe bitmap_free()
        Fixed indentation
      mysys/my_getopt.c:
        Ensure that we initialize option->value, option->max_value and value from GET_ASK_ADDR
      mysys/my_thr_init.c:
        Remove not used mutex THR_LOCK_keycache
      mysys/typelib.c:
        Fixed function comments
      sql-common/client.c:
        CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
        Fixed the multi_result flag is set also on SELECT;s
      sql/ha_myisam.cc:
        Fixed multiple key_cache handling
        (Now done on MyISAM level)
      sql/ha_myisammrg.cc:
        Fixed multiple key_cache handling
        (Now done on MyISAM level)
      sql/handler.cc:
        New multi key cache handling
      sql/handler.h:
        New multi key cache handling
        Added support for default character set
      sql/item.h:
        Added function cleanup() (Needed for prepared statements / cursors)
      sql/item_cmpfunc.h:
        Added cleanup function
      sql/item_func.cc:
        Indentation cleanup
      sql/mysql_priv.h:
        New multi-key-cache functions
        Removed LOCK_assign
      sql/mysqld.cc:
        New multi-key-cache handling
        Fixed that variable have_compress is set correctly
      sql/protocol.cc:
        SELECT didn't work reliable in multi-statements
      sql/set_var.cc:
        Support for new key cache variables
      sql/set_var.h:
        Support for new key cache variables
      sql/share/czech/errmsg.txt:
        New error messages
      sql/share/danish/errmsg.txt:
        New error messages
      sql/share/dutch/errmsg.txt:
        New error messages
      sql/share/english/errmsg.txt:
        New error messages
      sql/share/estonian/errmsg.txt:
        New error messages
      sql/share/french/errmsg.txt:
        New error messages
      sql/share/german/errmsg.txt:
        New error messages
      sql/share/greek/errmsg.txt:
        New error messages
      sql/share/hungarian/errmsg.txt:
        New error messages
      sql/share/italian/errmsg.txt:
        New error messages
      sql/share/japanese/errmsg.txt:
        New error messages
      sql/share/korean/errmsg.txt:
        New error messages
      sql/share/norwegian-ny/errmsg.txt:
        New error messages
      sql/share/norwegian/errmsg.txt:
        New error messages
      sql/share/polish/errmsg.txt:
        New error messages
      sql/share/portuguese/errmsg.txt:
        New error messages
      sql/share/romanian/errmsg.txt:
        New error messages
      sql/share/russian/errmsg.txt:
        New error messages
      sql/share/serbian/errmsg.txt:
        New error messages
      sql/share/slovak/errmsg.txt:
        New error messages
      sql/share/spanish/errmsg.txt:
        New error messages
      sql/share/swedish/errmsg.txt:
        New error messages
      sql/share/ukrainian/errmsg.txt:
        New error messages
      sql/sql_base.cc:
        Removed all key_cache handling (this is now done on MyISAM level)
        Change table_charset -> default_table_charset
      sql/sql_db.cc:
        table_charset -> default_table_charset
      sql/sql_delete.cc:
        table_charset -> default_table_charset
      sql/sql_lex.cc:
        CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
      sql/sql_lex.h:
        New option to store a name and length
      sql/sql_parse.cc:
        Support for mysql_set_server_option()
        Reset "default" keycache status variables in 'FLUSH STATUS' (Need to be improved later)
      sql/sql_show.cc:
        Add DEFAULT before CHARSET (for table character sets)
        Fetch key cache variables from 'sql_key_cache'
      sql/sql_table.cc:
        table_charset -> default_table_charset
        New multi-key-cache handling
      sql/sql_test.cc:
        Write information from all key caches
      sql/sql_yacc.yy:
        Changed syntax for CACHE INDEX ...
        Force user to use DEFAULT before database/table level character sets
      sql/structs.h:
        Added SHOW_KEY_CACHE_LONG (to get values from sql_key_cache)
      sql/table.cc:
        table_charset -> default_table_charset
      sql/table.h:
        New key cache handling (this is now done in mysys/mf_keycaches.c)
      sql/unireg.h:
        A
      1b739e39
    • unknown's avatar
  2. 17 Nov, 2003 8 commits
  3. 15 Nov, 2003 3 commits
  4. 14 Nov, 2003 1 commit
  5. 13 Nov, 2003 3 commits
  6. 12 Nov, 2003 4 commits
  7. 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
  8. 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
  9. 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
  10. 05 Nov, 2003 5 commits
  11. 04 Nov, 2003 4 commits