1. 20 Oct, 2004 5 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 0a929c5e
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      0a929c5e
    • unknown's avatar
      changed function name to prevent injection wrong code from 4.1 (WL#2133) · e3b55993
      unknown authored
      
      mysql-test/r/rpl_rotate_logs.result:
        changed error message
      mysql-test/t/rpl_rotate_logs.test:
        changed error message
      sql/log_event.cc:
        changed  function name to prevent injection wrong code from 4.1
      sql/mysqld.cc:
        changed  function name to prevent injection wrong code from 4.1
      sql/protocol.cc:
        changed  function name to prevent injection wrong code from 4.1
      sql/protocol.h:
        changed  function name to prevent injection wrong code from 4.1
      sql/sql_class.h:
        changed  function name to prevent injection wrong code from 4.1
      sql/sql_parse.cc:
        changed  function name to prevent injection wrong code from 4.1
      sql/sql_repl.cc:
        changed  function name to prevent injection wrong code from 4.1
      e3b55993
    • unknown's avatar
      make linux to behave (like freebsd does :) · 6853eb45
      unknown authored
      6853eb45
    • unknown's avatar
    • unknown's avatar
      errors without code removed · 066c9056
      unknown authored
      net_printf/send_error calls replaced by my_error family functions
      -1/1 (sent/unsent) error reporting removed
      (WL#2133)
      
      
      include/mysqld_error.h:
        new errors added.
      mysql-test/r/rpl_charset.result:
        new error
      mysql-test/r/rpl_timezone.result:
        new error
      mysql-test/r/sp-security.result:
        more clean error message
      mysql-test/r/sp.result:
        now error state intercepted correctly
      mysql-test/t/connect.test:
        new error message
      mysql-test/t/rpl_charset.test:
        new error message
      mysql-test/t/rpl_timezone.test:
        new error
      mysql-test/t/sp-security.test:
        more correct error handling
      mysql-test/t/sp.test:
        now error state intercepted correctly
      sql/ha_innodb.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/ha_innodb.h:
        -1/1 (sent/unsent) error reporting removed
      sql/item.cc:
        only boolean values should be returned by fix_fields()
      sql/item_cmpfunc.cc:
        only boolean values should be returned by fix_fields()
      sql/item_func.cc:
        only boolean values should be returned by fix_fields()
        net_printf/send_error calls replaced by my_error family functions
      sql/item_row.cc:
        only boolean values should be returned by fix_fields()
      sql/item_subselect.cc:
        only boolean values should be returned by fix_fields()
        -1/1 (sent/unsent) error reporting removed
      sql/item_subselect.h:
        -1/1 (sent/unsent) error reporting removed
      sql/item_sum.cc:
        only boolean values should be returned by fix_fields()
      sql/item_timefunc.cc:
        only boolean values should be returned by fix_fields()
      sql/item_uniq.h:
        only boolean values should be returned by fix_fields()
      sql/mysql_priv.h:
        -1/1 (sent/unsent) error reporting removed
      sql/mysqld.cc:
        net_printf/send_error calls replaced by my_error family functions
        changes in my_message_sql to support error handling correctly
      sql/protocol.cc:
        net_printf/send_error calls replaced by my_error family functions
      sql/protocol_cursor.cc:
        net_printf/send_error calls replaced by my_error family functions
      sql/repl_failsafe.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/repl_failsafe.h:
        -1/1 (sent/unsent) error reporting removed
      sql/set_var.cc:
        net_printf/send_error calls replaced by my_error family functions
      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/slave.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/slave.h:
        -1/1 (sent/unsent) error reporting removed
      sql/sp.cc:
        net_printf/send_error calls replaced by my_error family functions
      sql/sp_head.cc:
        new eror handling support
        net_printf/send_error calls replaced by my_error family functions
      sql/sp_rcontext.cc:
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_acl.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/sql_acl.h:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_base.cc:
        -1/1 (sent/unsent) error reporting removed
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_class.cc:
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_class.h:
        my_messhage_sql now set/reset query_error flag
      sql/sql_db.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_delete.cc:
        -1/1 (sent/unsent) error reporting removed
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_do.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_error.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_handler.cc:
        -1/1 (sent/unsent) error reporting removed
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_help.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/sql_insert.cc:
        -1/1 (sent/unsent) error reporting removed
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_lex.h:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_load.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_map.cc:
        errors without code removed
      sql/sql_parse.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed from mysql_execute_command
      sql/sql_prepare.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/sql_repl.cc:
        error messages fixed
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/sql_repl.h:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_select.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_select.h:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_show.cc:
        -1/1 (sent/unsent) error reporting removed
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_table.cc:
        net_printf/send_error calls replaced by my_error family functions
        -1/1 (sent/unsent) error reporting removed
      sql/sql_trigger.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_udf.cc:
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_union.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_update.cc:
        -1/1 (sent/unsent) error reporting removed
        net_printf/send_error calls replaced by my_error family functions
      sql/sql_view.cc:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_view.h:
        -1/1 (sent/unsent) error reporting removed
      sql/sql_yacc.yy:
        net_printf/send_error calls replaced by my_error family functions
      066c9056
  2. 19 Oct, 2004 1 commit
  3. 18 Oct, 2004 3 commits
    • unknown's avatar
      compatibility fix · bd5bafe1
      unknown authored
      test results corrected
      
      
      mysql-test/r/range.result:
        test results corrected
      mysql-test/t/range.test:
        test results corrected
      sql/opt_range.cc:
        compatibility fix
      bd5bafe1
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0/ · a6f61359
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      a6f61359
    • unknown's avatar
      arbitrary precision decimal numbers · decc71e6
      unknown authored
      
      strings/llstr.c:
        small optimization
      BitKeeper/etc/ignore:
        Added strings/test_decimal to the ignore list
      decc71e6
  4. 16 Oct, 2004 1 commit
    • unknown's avatar
      texi2html: · cb8f0d59
      unknown authored
        Change parsing of @image argument.
      
      
      Docs/Support/texi2html:
        Change parsing of @image argument.
      cb8f0d59
  5. 14 Oct, 2004 1 commit
    • unknown's avatar
      Implemented the stored procedure data access characteristics: · a750003f
      unknown authored
      NO SQL
      CONTAINS SQL (default)
      READS SQL DATA
      MODIFIES SQL DATA
      
      These are needed as hints for the replication.
      (Before this, we did have the default in the mysql.proc table, but no support in the parser.)
      
      
      mysql-test/r/sp.result:
        Modified test cases for new data access characteristics.
      mysql-test/t/sp.test:
        Modified test cases for new data access characteristics.
      scripts/mysql_create_system_tables.sh:
        We now support all the SP data access characteristics (not just CONTAINS SQL).
      scripts/mysql_fix_privilege_tables.sql:
        We now support all the SP data access characteristics (not just CONTAINS SQL).
      sql/lex.h:
        New tokens for SP data access characteristics.
      sql/sp.cc:
        Store, print and support alter of data access characteristics.
      sql/sp_head.cc:
        Added SP_ prefix to some symbols.
      sql/sql_lex.h:
        Added SP_ prefix to some symbols, and added SP data access enum.
      sql/sql_yacc.yy:
        Parse SP data access characteristics.
        (And allow "alter ... language sql", mostly as a formality, it was accidently
         put in the wrong clause before.)
      a750003f
  6. 13 Oct, 2004 1 commit
  7. 12 Oct, 2004 5 commits
  8. 11 Oct, 2004 5 commits
    • unknown's avatar
      column name changd · 15ccd961
      unknown authored
      15ccd961
    • unknown's avatar
      After merge adjustment of tests due to changes in cost estimates. · 662b24f8
      unknown authored
      
      BitKeeper/etc/ignore:
        Added server-tools/instance-manager/mysqlmanager to the ignore list
      662b24f8
    • unknown's avatar
      Merge with implementation of WL#1724. · 81f7ade6
      unknown authored
      
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/opt_range.cc:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      81f7ade6
    • unknown's avatar
      Manual merge with implementation for WL#1724 · b0982f21
      unknown authored
      b0982f21
    • unknown's avatar
      Fixes for WL#1724 required by the third code review. · 0f0e514f
      unknown authored
      
      sql/item.cc:
        Document actual behavior.
      sql/opt_range.cc:
        - Added a test for range predicates comparing incomparable argumens
        - Removed TRP_GROUP_MIN_MAX class members that are not used.
        - Uncommented CPU cost
        - More standard function return values
      sql/sql_select.cc:
        Remove unnecessary test.
      0f0e514f
  9. 10 Oct, 2004 3 commits
    • unknown's avatar
      fix privileges for old style privileges tables on fly (as it do... · 65ed6936
      unknown authored
      fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)
      fixed forgoten test
      
      
      mysql-test/r/ps_1general.result:
        SHOW TABLE putput changed
      sql/sql_acl.cc:
        fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)
      65ed6936
    • unknown's avatar
      showing table type now is controled by new parameter 'FULL' of SHOW TABLES... · 8b026230
      unknown authored
      showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES) (as it was decided on last dev conf)
      
      
      mysql-test/r/connect.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/ctype_recoding.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/drop.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/lowercase_table.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/rename.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/rpl000009.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/rpl_error_ignored_table.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/select.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/sp.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/system_mysql_db.result:
        returned SHOW TABLES default behaviour
      mysql-test/r/view.result:
        test of new parameter od SHOW TABLES and default behaviour without parameter
      mysql-test/t/view.test:
        test of new parameter od SHOW TABLES and default behaviour without parameter
      sql/mysql_priv.h:
        parameter added to mysqld_show_tables
      sql/sql_parse.cc:
        parameter added to mysqld_show_tables
      sql/sql_show.cc:
        showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES)
      sql/sql_yacc.yy:
        showing table type now is controled by new parameter 'FULL' of SHOW TABLES command (SHOW FULL TABLES)
      8b026230
    • unknown's avatar
      prevent substituting Item_ref as VIEW fields in WHERE conditions (BUG#5969) · 917a3474
      unknown authored
      prevent filling temporary tables of views on list fields command
      
      
      sql/opt_range.cc:
        debug output fixed
      sql/sql_base.cc:
        prevent substituting Item_ref as VIEW fields in WHERE conditions
      sql/sql_parse.cc:
        prevent filling temporary tables of views on list fields command
      917a3474
  10. 09 Oct, 2004 2 commits
  11. 08 Oct, 2004 3 commits
  12. 07 Oct, 2004 9 commits
    • unknown's avatar
      Portability fix (Got different results for double -> longlong when compiling... · 1262be26
      unknown authored
      Portability fix (Got different results for double -> longlong when compiling with full optimization)
      
      
      
      1262be26
    • unknown's avatar
      changes in SHOW CREATE VIEW output · 28d7a6a0
      unknown authored
      28d7a6a0
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 41c4c932
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      sql/sql_yacc.yy:
        Auto merged
      41c4c932
    • unknown's avatar
      allow merging views with subqueries in WHERE clause (BUG#5504) · 1e623bb9
      unknown authored
      
      mysql-test/r/view.result:
        test of subqueries in merged views
      mysql-test/t/view.test:
        test of subqueries in merged views
      sql/item_subselect.h:
        new method tu return place of subquery
      sql/sql_lex.cc:
        allow merging views with subqueries in WHERE clause
      sql/sql_view.cc:
        allow merging views with subqueries in WHERE clause
      1e623bb9
    • unknown's avatar
      Revised BUG#5000: SPs can be created with no default database. · 43785537
      unknown authored
      Now simply give an error if no database. (The "global SP feature" will be
      done using PATH instead.)
      
      
      mysql-test/r/sp-error.result:
        Removed test cases for undone "feature".
      mysql-test/t/sp-error.test:
        Removed test cases for undone "feature".
      sql/sql_parse.cc:
        Check if created procedure/function has a database; give error if not.
      sql/sql_yacc.yy:
        Undid the "global SP feature".
      43785537
    • unknown's avatar
      Fix results (becasue of strict mode) · 3ed9e668
      unknown authored
      3ed9e668
    • unknown's avatar
      test of DELETE privilege and cyclic reference added in case of altering view (BUG#5148) · 72ed0fc0
      unknown authored
      fixed ALTER VIEW syntax
      fixed WITH CHECK OPTION clause printing in SHOW CREATE VIEW
      
      
      mysql-test/r/view.result:
        test of VIEW altering
      mysql-test/t/view.test:
        test of VIEW altering
      sql/lex.h:
        explicitly mentioned undefined algorithm
      sql/sql_show.cc:
        explicitly mentioned undefined algorithm
        added printing WITH CHECK OPTION clause
      sql/sql_view.cc:
        test of DELETE privilege and cyclic reference added in case of altering view
        effective and requested WITH CHECK OPTION parameters divided
      sql/sql_yacc.yy:
        fixed ALTER VIEW
      sql/table.cc:
        effective and requested WITH CHECK OPTION parameters divided
      sql/table.h:
        effective and requested WITH CHECK OPTION parameters divided
      72ed0fc0
    • unknown's avatar
      Updates tests after 'no automatic default' patch · 4cc0562b
      unknown authored
      4cc0562b
    • unknown's avatar
      sql_updatable_view_key replaced with updatable_views_with_limit · 62ce24cf
      unknown authored
      now default behaviour do not prevent any updates of view.
      Also updating VIEWs of queries without LIMIT clause will not be checked at all (there will not be even warning)
      (changes according to discussion on last dev-conf)
      
      
      mysql-test/r/view.result:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      mysql-test/t/view.test:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      sql/mysqld.cc:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      sql/set_var.cc:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      sql/sql_class.h:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      sql/sql_view.cc:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      sql/sql_view.h:
        sql_updatable_view_key replaced with updatable_views_with_limit, default behaviour changed
      62ce24cf
  13. 06 Oct, 2004 1 commit
    • unknown's avatar
      fixed & added comments (according to Igor's review and a bit more) · 640fefff
      unknown authored
      
      sql/item_strfunc.h:
        spelling fixed
      sql/parse_file.cc:
        spelling fixed
      sql/parse_file.h:
        spelling fixed
      sql/password.c:
        spelling fixed
      sql/sql_acl.cc:
        spelling fixed
      sql/sql_lex.cc:
        comments added and fixed
      sql/sql_parse.cc:
        spelling fixed
      sql/sql_show.cc:
        spelling fixed
      sql/sql_update.cc:
        comments fixed
      sql/sql_view.cc:
        comments added
        spelling and comments fixed
        // comments changed with /* */ ones
      sql/sql_yacc.yy:
        comments fixed
      sql/table.cc:
        spelling fixed
        comments added and fixed
      sql/table.h:
        spelling fixed
        comments fixed
      640fefff