1. 19 Nov, 2003 5 commits
    • unknown's avatar
      Merging 4.1->5.0. · 214ad828
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/triggers/post-commit:
        Auto merged
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.h:
        Auto merged
      214ad828
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · b52b44f8
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      b52b44f8
    • unknown's avatar
      cp850.xml: · 0dd80f30
      unknown authored
        There were errors in cp850: in unicode, ctype and sort arrays
      
      
      sql/share/charsets/cp850.xml:
        There were errors in cp850: in unicode, ctype and sort arrays
      0dd80f30
    • unknown's avatar
      Fixed BUG#1862 (flush table in SPs didn't work). · bd226350
      unknown authored
      Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
      might work, SELECT INTO with not row now gives a "no data" warning (instead of
      the "empty query" error), etc.
      Updated test cases accordingly.
      
      
      mysql-test/r/sp-error.result:
        Corrected security syntax for alter/create procedure.
      mysql-test/r/sp.result:
        Corrected security syntax for alter/create procedure.
        New tests for setting local variables to null,
        bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
        and corrected "no data" warning for SELECT INTO with no rows.
      mysql-test/t/sp-error.test:
        Corrected security syntax for alter/create procedure.
      mysql-test/t/sp.test:
        Corrected security syntax for alter/create procedure.
        New tests for setting local variables to null,
        bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
        and corrected "no data" warning for SELECT INTO with no rows.
      sql/lex.h:
        Added SQL_SYM (and added a few _SYM suffixes for new symbols).
      sql/sp_head.cc:
        Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
        up in the wrong memroot).
        Catch errors and warnings even if return values is 0 from sub-statements.
        Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
        Set old table pointers to NULL after sub-statement call (since all tables are
        closed).
      sql/sql_class.cc:
        Corrected error message when no rows return by a SELECT INTO var; should
        be a "no data" warning.
      sql/sql_lex.h:
        Have to store the original table_list first pointer for some
        sub-statements in SPs.
      sql/sql_yacc.yy:
        Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
        suffixes, and fixed valgrind complaints for SP COMMENTs.
        (Also removed some now irrelevant comments.)
      bd226350
    • unknown's avatar
      Fixed C syntax error in mysys/mf_keycache.c. · a7395672
      unknown authored
      
      mysys/mf_keycache.c:
        Fixed C syntax error.
      a7395672
  2. 18 Nov, 2003 23 commits
    • unknown's avatar
      - added a missing comma in sql_yacc.yy (maybe a merge error?) · 1cd722bb
      unknown authored
      
      sql/sql_yacc.yy:
         - added a missing comma (maybe a merge error?)
      1cd722bb
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 87df2aa9
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      87df2aa9
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d27c3d3
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
      
      
      5d27c3d3
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 9ed38fac
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      9ed38fac
    • unknown's avatar
      Merge gweir@build.mysql.com:/home/bk/mysql-4.1 · e6916f1c
      unknown authored
      into mysql.com:/bk/mysql-4.1
      
      
      e6916f1c
    • unknown's avatar
      470cef92
    • unknown's avatar
      Add Docs/internals.texi to Windows source packages. · 27e18e32
      unknown authored
      
      scripts/make_win_src_distribution.sh:
        Changed to copy Docs/internals.texi to target directory.
      27e18e32
    • unknown's avatar
      - fixed typo in mysql-test-run error message · 1afd45db
      unknown authored
      
      mysql-test/mysql-test-run.sh:
         - fixed typo in error message
      1afd45db
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 7dd15833
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      7dd15833
    • unknown's avatar
      changed name of bit on more descriptive (after rewie change) · 0d412844
      unknown authored
      
      sql/item_create.cc:
        changed name of bit on more descriptive
      sql/item_func.cc:
        changed name of bit on more descriptive
      sql/mysql_priv.h:
        changed name of bit on more descriptive
      sql/sql_lex.h:
        changed name of bit on more descriptive
      sql/sql_yacc.yy:
        changed name of bit on more descriptive
      0d412844
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 072acf59
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      072acf59
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 1ea21d70
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
      
      
      1ea21d70
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ccab27dc
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
      
      
      ccab27dc
    • unknown's avatar
      Merge with 4.0 tree · 84281294
      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
      84281294
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ca29aa54
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      ca29aa54
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 848088d6
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
      
      
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      848088d6
    • unknown's avatar
      - internals.texi will now be part of the source distribution. However, · 012d8be4
      unknown authored
         as this is a document that belongs to the mysqldoc tree, it needs to
         be copied over manually (using the Bootstrap script), before doing an
         official release distribution. The file Docs/internals.texi in this tree
         is only a dummy file to keep "make dist" happy.
      
      
      Build-tools/Bootstrap:
         - overwrite the dummy internals.texi with the real one, when creating
           the release source distribution with Bootstrap
      Docs/Makefile.am:
         - add internals.texi to the source distribution
      012d8be4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cde9c429
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      
      cde9c429
    • unknown's avatar
      Delete duplicate error message names · c0541317
      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
      c0541317
    • unknown's avatar
      Fix for bug #1820 · 3a553cf2
      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
      3a553cf2
    • unknown's avatar
      merge · 6b671182
      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
      6b671182
    • unknown's avatar
      CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS · e72124c4
      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
      e72124c4
    • unknown's avatar
  3. 17 Nov, 2003 12 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · cf192616
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      cf192616
    • unknown's avatar
      IGNORE option was added for DELETE statement (WL#1334) · 900d00c8
      unknown authored
      
      mysql-test/r/delete.result:
        test of new IGNORE option for DELETE
      mysql-test/r/subselect.result:
        test moved to delete.test
      mysql-test/t/delete.test:
        test of new IGNORE option for DELETE
      mysql-test/t/subselect.test:
        test moved to delete.test
      sql/sql_delete.cc:
        set errors ignoring for simple delete command
      sql/sql_yacc.yy:
        add IGNORE option for DELETE command
      900d00c8
    • 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
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 224e3505
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/mysql-5.0.sp
      
      
      sql/sp_head.cc:
        Auto merged
      224e3505
    • unknown's avatar
      WL#1241: SHOW PROCEDURE/FUNCTION · 6c1a2b7f
      unknown authored
      WL#1263: Support for the attributes COMMENT and SUID
               in CREATE/ALTER PROCEDURE/FUNCTION
      
      
      include/mysqld_error.h:
        Error code for 'alter procedure'
      mysql-test/r/sp-error.result:
        Test for WL#1241&WL#1263
      mysql-test/r/sp.result:
        Test for WL#1241&WL#1263
      mysql-test/t/sp-error.test:
        Test for WL#1241&WL#1263
      mysql-test/t/sp.test:
        Test for WL#1241&WL#1263
      sql/share/czech/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/danish/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/dutch/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/english/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/estonian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/french/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/german/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/greek/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/hungarian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/italian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/japanese/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/korean/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/norwegian-ny/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/norwegian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/polish/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/portuguese/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/romanian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/russian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/serbian/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/slovak/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/spanish/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/swedish/errmsg.txt:
        Error massage for 'alter procedure'
      sql/share/ukrainian/errmsg.txt:
        Error massage for 'alter procedure'
      6c1a2b7f
    • unknown's avatar
      Merge with 3.23 (only comment changes) · c072804d
      unknown authored
      
      BUILD/compile-pentium-gcov:
        Use local file
      mysys/thr_alarm.c:
        Get comment from 3.23
      sql/mini_client.cc:
        Get comment from 3.23
      c072804d
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8fed6653
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.lastday
      
      
      8fed6653
    • unknown's avatar
      WL#1253: LAST_DAY · ac584b24
      unknown authored
      
      mysql-test/r/func_time.result:
        Test for WL#1253: LAST_DAY
      mysql-test/t/func_time.test:
        Test for WL#1253: LAST_DAY
      ac584b24
    • unknown's avatar
      Bugfix, handling null values. · 74e77582
      unknown authored
      74e77582
    • unknown's avatar
      Merge service name code · e8302795
      unknown authored
      e8302795
    • unknown's avatar
      Fix for service names on windows; Now we always put the service name last when we create a service · 348416e9
      unknown authored
      
      
      myisam/mi_test2.c:
        Moved test so that resize_key_cache() is always tested
      mysys/mf_keycache.c:
        Fixed comment
      348416e9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-3.23 · d544ef76
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-3.23
      
      
      d544ef76