1. 15 Sep, 2004 1 commit
    • unknown's avatar
      support of join view updateability (WL#1809) · 9aa459f0
      unknown authored
      
      include/mysqld_error.h:
        new error mesaages
      mysql-test/r/view.result:
        tests of updatint/inserting join views
      mysql-test/t/view.test:
        tests of updatint/inserting join views
      sql/mysql_priv.h:
        support of "usual UPDATE" -> "multi UPDATE" conversion
      sql/share/czech/errmsg.txt:
        new error mesaages
      sql/share/danish/errmsg.txt:
        new error mesaages
      sql/share/dutch/errmsg.txt:
        new error mesaages
      sql/share/english/errmsg.txt:
        new error mesaages
      sql/share/estonian/errmsg.txt:
        new error mesaages
      sql/share/french/errmsg.txt:
        new error mesaages
      sql/share/german/errmsg.txt:
        new error mesaages
      sql/share/greek/errmsg.txt:
        new error mesaages
      sql/share/hungarian/errmsg.txt:
        new error mesaages
      sql/share/italian/errmsg.txt:
        new error mesaages
      sql/share/japanese/errmsg.txt:
        new error mesaages
      sql/share/korean/errmsg.txt:
        new error mesaages
      sql/share/norwegian-ny/errmsg.txt:
        new error mesaages
      sql/share/norwegian/errmsg.txt:
        new error mesaages
      sql/share/polish/errmsg.txt:
        new error mesaages
      sql/share/portuguese/errmsg.txt:
        new error mesaages
      sql/share/romanian/errmsg.txt:
        new error mesaages
      sql/share/russian/errmsg.txt:
        new error mesaages
      sql/share/serbian/errmsg.txt:
        new error mesaages
      sql/share/slovak/errmsg.txt:
        new error mesaages
      sql/share/spanish/errmsg.txt:
        new error mesaages
      sql/share/swedish/errmsg.txt:
        new error mesaages
      sql/share/ukrainian/errmsg.txt:
        new error mesaages
      sql/sql_base.cc:
        test to avoid join virew to be catched here
      sql/sql_class.h:
        support of join views add to update
      sql/sql_delete.cc:
        support of join views add to delete(error issue)
      sql/sql_insert.cc:
        support of join views add to insert
        (order of some check changed, to allow find table which will be inserted in, when we will know which fields will be inserted)
        mechanism of calling setup_tables() only once fixed for INSERT SELECT
      sql/sql_parse.cc:
        support of "usual UPDATE" -> "multi UPDATE" conversion
        mysql_insert_select_prepare now called in same environment for usual queries and PS preparing
        support of join views add to delete (error issue)
      sql/sql_prepare.cc:
        support of "usual UPDATE" -> "multi UPDATE" conversion
        support of join views add to delete (error issue)
      sql/sql_update.cc:
        support of join views add to update
      sql/sql_view.cc:
        join views made updatable
      sql/sql_view.h:
        insert_view_fields now can check some errors
      sql/table.cc:
        methods to support recursive walk by tables tree
      sql/table.h:
        methods to support recursive walk by tables tree
      9aa459f0
  2. 14 Sep, 2004 1 commit
    • unknown's avatar
      fixed merged view fields names (BUG#5147) · 55a8c28c
      unknown authored
      support of merged VIEW over several tables added (WL#1809)
      
      
      mysql-test/r/view.result:
        merge of VIEW with several tables
      mysql-test/t/view.test:
        merge of VIEW with several tables
      sql/item.cc:
        renaming Item and restoring item name on cleunup()
      sql/item.h:
        renaming Item and restoring item name on cleunup()
        debug output added
      sql/item_cmpfunc.h:
        setup_conds() changed to support two tables lists
      sql/item_subselect.cc:
        list of table leaves used instead of local table list for name resolving
      sql/mysql_priv.h:
        setup_conds() and setup_tables() changed to support two tables lists
      sql/opt_sum.cc:
        list of table leaves used instead of local table list for name resolving
      sql/sp.cc:
        setup_tables() changed to support two tables lists
      sql/sql_base.cc:
        skip temporary tables in table finding
        fixed merged view fields names (BUG#5147)
      sql/sql_delete.cc:
        setup_conds() and setup_tables() changed to support two tables lists
      sql/sql_help.cc:
        setup_tables() changed to support two tables lists
      sql/sql_insert.cc:
        setup_tables() changed to support two tables lists
        name handling support
      sql/sql_lex.cc:
        allow view with several tables for MERGE
      sql/sql_lex.h:
        new table list
      sql/sql_load.cc:
        setup_tables() changed to support two tables lists
      sql/sql_olap.cc:
        setup_tables() changed to support two tables lists
      sql/sql_parse.cc:
        new list support
      sql/sql_prepare.cc:
        new list support
      sql/sql_select.cc:
        list of table leaves used instead of local table list for name resolving
      sql/sql_update.cc:
        setup_conds() and setup_tables() changed to support two tables lists
      sql/sql_view.cc:
        support of MERGED VIEWS with several tables
      sql/sql_yacc.yy:
        removed blanks in new code
      sql/table.cc:
        fixed setup view code
        support of merged VIEW over several tables added
      sql/table.h:
        fixed merged view fields names (BUG#5147)
      55a8c28c
  3. 11 Sep, 2004 4 commits
  4. 10 Sep, 2004 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f4c303b8
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      f4c303b8
    • unknown's avatar
      Fixed a problem causing load_defaults not to accept some command-line · 15526e4e
      unknown authored
      options.
      
      
      mysys/default.c:
        Fixed search_files function to return the number of used arguments
        properly.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      15526e4e
    • unknown's avatar
      Fix bad output in SHOW CREATE VIEW, update affected · 952a778d
      unknown authored
      test result.
      
      
      mysql-test/r/view.result:
        Update test result to match sql_show.cc change.
      sql/sql_show.cc:
        Fix bad output in SHOW CREATE VIEW.
      952a778d
    • unknown's avatar
      view with WHERE in nested join (BUG#5511) · 8b2ffdbf
      unknown authored
      
      mysql-test/r/view.result:
        view with WHERE in nested join
      mysql-test/t/view.test:
        view with WHERE in nested join
      sql/table.cc:
        fixed merging of VIEW
      8b2ffdbf
    • unknown's avatar
      sql_yacc.yy: · 9af3278f
      unknown authored
        Make "FRAC_SECOND"/"SQL_TSI_FRAC_SECOND" non-reserved words,
        must like "SECOND"/"SQL_TSI_SECOND", "MINUTE"/"SQL_TSI_MINUTE",
        etc.
        Will wait for okay to push. (It doesn't break any tests.)
      
      
      sql/sql_yacc.yy:
        Make "FRAC_SECOND"/"SQL_TSI_FRAC_SECOND" non-reserved words,
        must like "SECOND"/"SQL_TSI_SECOND", "MINUTE"/"SQL_TSI_MINUTE",
        etc.
      9af3278f
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · d6f66318
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      
      d6f66318
    • unknown's avatar
      Fixed BUG#4941: Stored procedure crash fetching null value into variable. · 749c0384
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#4941.
      mysql-test/t/sp.test:
        New test case for BUG#4941.
      sql/protocol_cursor.cc:
        Handle null values.
      sql/sp_rcontext.cc:
        Handle null values.
      749c0384
    • unknown's avatar
      post merge fix · b5983daa
      unknown authored
      b5983daa
    • unknown's avatar
      Merge · 0650a284
      unknown authored
      
      sql/sql_handler.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      0650a284
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · fc8da24a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      fc8da24a
    • unknown's avatar
      thd pointer fixed · 76001900
      unknown authored
      
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      mysql-test/r/merge.result:
        fix of test
      76001900
    • unknown's avatar
      Fixed BUG#3294: Stored procedure crash if table dropped before use. · 1912148c
      unknown authored
        Dropping the table was not the real problem, the problem was with errors
        occuring within error handlers.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#3294.
      mysql-test/t/sp-error.test:
        New test case for BUG#3294.
      sql/sp_head.cc:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      sql/sp_head.h:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      sql/sp_rcontext.cc:
        Keep track on if we're in a handler already, for error handling.
      sql/sp_rcontext.h:
        Keep track on if we're in a handler already, for error handling.
      sql/sql_yacc.yy:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      1912148c
    • unknown's avatar
      Fixed --with-embedded builds. · 862e7856
      unknown authored
      Added previously missing sql_trigger.cc file to embedded library.
      
      
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      libmysqld/Makefile.am:
        Added previously sql_trigger.cc file to embedded library.
      862e7856
  5. 09 Sep, 2004 10 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f3d4db99
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.h:
        Auto merged
      f3d4db99
    • unknown's avatar
      post merge fixes · b386f888
      unknown authored
      
      mysql-test/t/merge.test:
        additional test
      sql/item.h:
        parameter to detect need of saving view field names
      sql/item_subselect.cc:
        arena fix
        used nearest thd pointer
      sql/item_sum.cc:
        after merge fix
      sql/mysql_priv.h:
        after merge fix
      sql/sql_base.cc:
        fixed unique test
        fixed postmerge arena mamgement
      sql/sql_class.h:
        mey method to detect conventional execution
      sql/sql_handler.cc:
        new parameter
      sql/sql_lex.cc:
        fixed postmerge arena mamgement
      sql/sql_parse.cc:
        fixed unique test
      sql/sql_select.cc:
        fixed postmerge arena mamgement
      sql/sql_union.cc:
        fixed postmerge arena mamgement
      sql/sql_view.cc:
        fixed postmerge arena mamgement
      sql/table.cc:
        fixed postmerge arena mamgement
      b386f888
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b0afd74e
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-1218-a
      
      
      sql/item_func.h:
        Auto merged
      b0afd74e
    • unknown's avatar
      After merge fixes for WL#1218 "Triggers" · 97cbcbb0
      unknown authored
      
      mysql-test/t/trigger.test:
        After merge fix, error codes corrected.
      sql/sp_head.cc:
        After mrege fix. Fixed typo.
      sql/sql_trigger.cc:
        After merge fix. wait_if_gloabl_read_lock has one more argument now.
      97cbcbb0
    • unknown's avatar
      Fixed BUG#4487: Stored procedure connection aborted if uninitialized char. · 0994dc39
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#4487.
      mysql-test/t/sp.test:
        New test case for BUG#4487.
      sql/item_func.h:
        Propagate null_value properly in sp functions.
      0994dc39
    • unknown's avatar
      Yet another manual merge with main tree for patch for WL#1218 "Triggers" · eb75a9fd
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.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/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
      include/mysqld_error.h:
        Manual merge.
      sql/Makefile.am:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      sql/sql_lex.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      eb75a9fd
    • unknown's avatar
      merge · ed2c4854
      unknown authored
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      ed2c4854
    • unknown's avatar
      Update after merge · bc787254
      unknown authored
      bc787254
    • unknown's avatar
      Merge on pull · e18b7ea9
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_sys.h:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      e18b7ea9
    • unknown's avatar
      After merge fixes of merge with 4.1 that included the new arena code. · 33efc967
      unknown authored
      Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
      Prefix addresses with 0x for easier comparisons of debug logs
      Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
      This fix changed some 'index' queries to 'range' queries in the test suite
      Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
      This fix removed of a lot of 'Using where' notes in the test suite.
      Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
      Give NOTE instead of WARNING for safe field-type conversions
      
      
      Makefile.am:
        Don't automaticly update files from bk
      client/mysqlbinlog.cc:
        Merge with 4.1 (+ apply bug fixes for --offset and --start-position)
      include/my_sys.h:
        Faster clear_alloc_root()
      mysql-test/r/bdb.result:
        Updated results after merge
      mysql-test/r/create.result:
        Updated results after merge
      mysql-test/r/func_group.result:
        Updated results after merge
      mysql-test/r/func_if.result:
        Updated results after merge
      mysql-test/r/heap_btree.result:
        Updated results after merge
      mysql-test/r/index_merge.result:
        Updated results after merge
      mysql-test/r/index_merge_ror.result:
        Updated results after merge
      mysql-test/r/innodb.result:
        Updated results after merge
      mysql-test/r/join_outer.result:
        Updated results after merge
      mysql-test/r/mysqlbinlog2.result:
        Updated results after merge
      mysql-test/r/negation_elimination.result:
        Updated results after merge
      mysql-test/r/null.result:
        Updated results after merge
        Added more tests
      mysql-test/r/null_key.result:
        Updated results after merge
        Added more tests
      mysql-test/r/order_by.result:
        Updated results after merge
      mysql-test/r/range.result:
        Updated results after merge
        Added more tests
      mysql-test/r/rpl_charset.result:
        Updated results after merge
      mysql-test/r/sp-error.result:
        Updated results after merge
      mysql-test/r/sp.result:
        Updated results after merge
        Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
      mysql-test/r/type_blob.result:
        Updated results after merge
        (Some warnings are now notes)
      mysql-test/r/user_var.result:
        Updated results after merge
        Added more tests
      mysql-test/r/variables.result:
        Updated results after merge
      mysql-test/r/view.result:
        Updated results after merge
      mysql-test/t/mysqlbinlog2.test:
        Updated tests to use new positions
      mysql-test/t/null.test:
        More tests
      mysql-test/t/null_key.test:
        More tests
      mysql-test/t/range.test:
        More tests
      mysql-test/t/rpl_charset.test:
        Avoid big diffs in the future if tests changes
      mysql-test/t/sp-error.test:
        Updated error numbers
      mysql-test/t/sp-security.test:
        Updated error numbers
      mysql-test/t/sp.test:
        Updated results after merge
        Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
      mysql-test/t/user_var.test:
        More tests
      mysql-test/t/view.test:
        Updated error numbers
      mysys/my_alloc.c:
        Write into debug log the address of the allocated area
      sql/ha_isam.cc:
        Prefix addresses with 0x for easier comparisons of debug logs
      sql/ha_myisam.cc:
        Prefix addresses with 0x for easier comparisons of debug logs
      sql/ha_ndbcluster.cc:
        Add missing enum to switch
      sql/handler.cc:
        remove compiler warning
      sql/item.cc:
        More debugging
        Simple cleanup
      sql/item.h:
        Move Item::cleanup() to item.cc
      sql/item_cmpfunc.cc:
        Fix arena code
      sql/item_subselect.cc:
        After merge fixes
      sql/item_subselect.h:
        After merge fixes
      sql/item_sum.cc:
        Updated comment
      sql/log_event.cc:
        Remove wrong test
      sql/mysql_priv.h:
        Indentation fixes
      sql/mysqld.cc:
        After merge fixes
        Added 0x to pointers in debug log
      sql/opt_range.cc:
        Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
        This fix changed some 'index' queries to 'range' queries in the test suite
      sql/set_var.cc:
        Indentation fixes
      sql/sp_head.cc:
        Set state to INITIALIZED to make SP work with new arena code
      sql/sql_base.cc:
        After merge fixes
      sql/sql_class.cc:
        More debugging
        Use clear_alloc_root() instead of init_alloc_root() as the former is faster
      sql/sql_class.h:
        New method 'only_prepare()'
      sql/sql_lex.cc:
        After merge fixes
      sql/sql_lex.h:
        After merge fixes
      sql/sql_parse.cc:
        Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore)
        Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_select.cc:
        Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
        This fix removed of a lot of 'Using where' notes in the test suite
      sql/sql_table.cc:
        Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
      sql/sql_union.cc:
        After merge fix
      sql/sql_view.cc:
        After merge fix
      sql/table.cc:
        After merge fix
      sql/tztime.cc:
        Update timezone table handling to use new table lists structure
      sql/tztime.h:
        Update timezone table handling to use new table lists structure
      sql/unireg.cc:
        Use 0x before pointers
      33efc967
  6. 08 Sep, 2004 5 commits
    • unknown's avatar
      WL#1218 "Triggers" · 12ce293a
      unknown authored
      After review and after merge fixes.
      
      
      mysql-test/t/trigger.test:
        After merge fix. Updated error codes.
      sql/sp_head.cc:
        After merge fix.
        To give some chances for functions/triggers we have to close tables during sp_instr_* 
        execution only if we have opened them before.
      sql/sp_head.h:
        After merge fix. sp_instr constructor now takes one more argument.
      sql/sql_trigger.cc:
        After merge and review fixes.
        Some variable renaming and optimizations.
      sql/sql_yacc.yy:
        After merge fixes.
        sp_instr_* classes now require sp context as constructor parameter.
        Also we should be careful with adding table for which we are creating trigger to table 
        list. Some elements in trigger body can damage LEX::query_tables and so we should add this
        table to list only after parsing trigger body.
      12ce293a
    • unknown's avatar
      Fixed BUG#5000: SPs can be created with no default database. · c92b5349
      unknown authored
        Easy to prevent crash, but the question was how to treat this case?
        We ended up implementing the "global" SPs (i.e. with no associated
        db), which were planned but left unresolved when SPs moved into dbs.
        So now things like "call .p()" work too.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#5000, and "global" SPs in general.
      mysql-test/t/sp-error.test:
        New test case for BUG#5000, and "global" SPs in general.
      sql/sp.cc:
        Prevent crash when the new db is null.
      sql/sp_head.cc:
        Don't set the db part of the name to thd->db, we have already set it correctly
        in the provided name struct.
        Also, don't attempt to change "no-db" when executing an SP.
      sql/sql_yacc.yy:
        Added support for the "global SP" syntax, e.g ".p()".
      c92b5349
    • unknown's avatar
      Fixed BUG#5258: Stored procedure modified date is 0000-00-00. · 1bf3ce01
      unknown authored
        Althought techically not a but (as it's functioning as designed),
        it was decided that the design should be changed. Some users have
        a problem with dates being '0000-00-00' and the SQL standard specifies
        that the modification date should be the same as the creation date
        at creation.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#5258.
      mysql-test/t/sp.test:
        New test case for BUG#5258.
      sql/sp.cc:
        Set the modification time at creation too.
      1bf3ce01
    • unknown's avatar
      Merge of changes from the main tree to tree for WL#1218 "Triggers". · cab6f8df
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/parse_file.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.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
      include/mysqld_error.h:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/share/czech/errmsg.txt:
        Manual merge.
      sql/share/danish/errmsg.txt:
        Manual merge.
      sql/share/dutch/errmsg.txt:
        Manual merge.
      sql/share/english/errmsg.txt:
        Manual merge.
      sql/share/estonian/errmsg.txt:
        Manual merge.
      sql/share/french/errmsg.txt:
        Manual merge.
      sql/share/german/errmsg.txt:
        Manual merge.
      sql/share/greek/errmsg.txt:
        Manual merge.
      sql/share/hungarian/errmsg.txt:
        Manual merge.
      sql/share/italian/errmsg.txt:
        Manual merge.
      sql/share/japanese/errmsg.txt:
        Manual merge.
      sql/share/korean/errmsg.txt:
        Manual merge.
      sql/share/norwegian-ny/errmsg.txt:
        Manual merge.
      sql/share/norwegian/errmsg.txt:
        Manual merge.
      sql/share/polish/errmsg.txt:
        Manual merge.
      sql/share/portuguese/errmsg.txt:
        Manual merge.
      sql/share/romanian/errmsg.txt:
        Manual merge.
      sql/share/russian/errmsg.txt:
        Manual merge.
      sql/share/serbian/errmsg.txt:
        Manual merge.
      sql/share/slovak/errmsg.txt:
        Manual merge.
      sql/share/spanish/errmsg.txt:
        Manual merge.
      sql/share/swedish/errmsg.txt:
        Manual merge.
      sql/share/ukrainian/errmsg.txt:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      cab6f8df
    • unknown's avatar
      test of updating and fetching from the same table check (BUG##5157) · 7de077f7
      unknown authored
      
      mysql-test/r/lowercase_view.result:
        test of updating and fetching from the same table check
      mysql-test/r/view.result:
        test of updating and fetching from the same table check
      mysql-test/t/lowercase_view.test:
        test of updating and fetching from the same table check
      mysql-test/t/view.test:
        test of updating and fetching from the same table check
      sql/mysql_priv.h:
        unique table test
      sql/sql_base.cc:
        unique table test which take into account views added
      sql/sql_delete.cc:
        unique table test which take into account views added
      sql/sql_insert.cc:
        unique table test which take into account views added
      sql/sql_parse.cc:
        unique table test which take into account views added
      sql/sql_update.cc:
        unique table test which take into account views added
      sql/sql_view.cc:
        unique table test which take into account views added
      sql/table.h:
        save next independent (do not belong to current view) table
      7de077f7
  7. 07 Sep, 2004 6 commits
    • unknown's avatar
      returning test environment · c647f600
      unknown authored
      c647f600
    • unknown's avatar
      ixed table and db name of fields incase of lower_case_table_names (BUG#5154) · 38404d90
      unknown authored
      
      sql/item.cc:
        fixed table and db name of fields incase of lower_case_table_names
      38404d90
    • unknown's avatar
      Fixed typo that showed up in non-debug build (in sql/sql_show.cc). · 9243aa9e
      unknown authored
      
      sql/sql_show.cc:
        Fixed typo that showed up in non-debug build.
      9243aa9e
    • unknown's avatar
      support of view to COM_FIELD_LIST added (BUG#5145) · 3db98095
      unknown authored
      
      sql/sql_parse.cc:
        support of view to COM_FIELD_LIST added
      sql/sql_show.cc:
        support of view to COM_FIELD_LIST added
      3db98095
    • unknown's avatar
      WL#1218 "Triggers". Some very preliminary version of patch. · 52ac4935
      unknown authored
      Mostly needed for Monty for him getting notion what needed for triggers 
      from new .FRM format. 
      
      Things to be done:
      - Right placement of trigger's invocations
      - Right handling of errors in triggers (including transaction rollback)
      - Support for priviliges
      - Right handling of DROP/RENAME table (hope that it will be handled automatically
        with merging of .TRG into .FRM file)
      - Saving/restoring some information critical for trigger creation and replication
        with their definitions (e.g. sql_mode, creator, ...)
      - Replication
      
      Already has some known bugs so probably not for general review.
      
      
      include/mysqld_error.h:
        Added trigger related error codes.
      sql/Makefile.am:
        Added sql_trigger.* files to list of sources from which mysqld is built.
      sql/item.cc:
        Added Item_trigger_field class representing field of new/old version of row which is 
        inserted/updated/deleted and for which trigger is invoked.
      sql/item.h:
        Added enums for describing trigger properties. (Here because of dependencies).
        Added Item_trigger_field class representing field of new/old version of row which is 
        inserted/updated/deleted and for which trigger is invoked.
      sql/item_func.cc:
        Added Item_func_set_user_var::print_as_stmt() for printing of assignment to ser variable
        from stored procedures.
        Added comment clarifying why we don't need set no_send_ok when calling stored functions.
      sql/item_func.h:
        Added Item_func_set_user_var::print_as_stmt() for printing of assignment to ser variable
        from stored procedures.
      sql/lex.h:
        Symbols used in statements defining triggers were added.
      sql/mysql_priv.h:
        Exported some functions needed for triggers implementation.
      sql/parse_file.cc:
        Cleaned up FILE_OPTIONS_STRLIST handling (needed for triggers).
      sql/parse_file.h:
        Cleaned up FILE_OPTIONS_STRLIST handling (needed for triggers).
      sql/share/czech/errmsg.txt:
        Added trigger related error messages.
      sql/share/danish/errmsg.txt:
        Added trigger related error messages.
      sql/share/dutch/errmsg.txt:
        Added trigger related error messages.
      sql/share/english/errmsg.txt:
        Added trigger related error messages.
      sql/share/estonian/errmsg.txt:
        Added trigger related error messages.
      sql/share/french/errmsg.txt:
        Added trigger related error messages.
      sql/share/german/errmsg.txt:
        Added trigger related error messages.
      sql/share/greek/errmsg.txt:
        Added trigger related error messages.
      sql/share/hungarian/errmsg.txt:
        Added trigger related error messages.
      sql/share/italian/errmsg.txt:
        Added trigger related error messages.
      sql/share/japanese/errmsg.txt:
        Added trigger related error messages.
      sql/share/korean/errmsg.txt:
        Added trigger related error messages.
      sql/share/norwegian-ny/errmsg.txt:
        Added trigger related error messages.
      sql/share/norwegian/errmsg.txt:
        Added trigger related error messages.
      sql/share/polish/errmsg.txt:
        Added trigger related error messages.
      sql/share/portuguese/errmsg.txt:
        Added trigger related error messages.
      sql/share/romanian/errmsg.txt:
        Added trigger related error messages.
      sql/share/russian/errmsg.txt:
        Added trigger related error messages.
      sql/share/serbian/errmsg.txt:
        Added trigger related error messages.
      sql/share/slovak/errmsg.txt:
        Added trigger related error messages.
      sql/share/spanish/errmsg.txt:
        Added trigger related error messages.
      sql/share/swedish/errmsg.txt:
        Added trigger related error messages.
      sql/share/ukrainian/errmsg.txt:
        Added trigger related error messages.
      sql/sp_head.cc:
        sp_head::init_strings(): added support for triggers 
          (we don't have most of strings for them)
        sp_head::execute_function(): triggers don't require RETURN
        sp_head::reset_lex(): added propagation of trigger properties to LEX used for 
         parsing of statements composing trigger body.
        Added two more SP instructions:
        - sp_instr_set_user_var for setting user variables in stored functions and triggers
          (we can't use sp_instr_stmt and "SET @A:=..." statement since it will close open 
          tables and thus break execution of calling statement.
        - sp_instr_set_trigger_field for assignment to fields of row being updated/inserted in
          triggers
      sql/sp_head.h:
        Added new type of sp_head object - TYPE_ENUM_TRIGGER
        Added two more SP instructions:
        - sp_instr_set_user_var for setting user variables in stored functions and triggers
          (we can't use sp_instr_stmt and "SET @A:=..." statement since it will close open 
          tables and thus break execution of calling statement.
        - sp_instr_set_trigger_field for assignment to fields of row being updated/inserted in
          triggers
      sql/sql_base.cc:
        Now freeing memory occupied by trigger related structures when closing tables.
        open_unireg_entry(): added loading of triggers for table.
        find_field_in_real_table() is now public since it required by Item_trigger_field in item.cc
      sql/sql_delete.cc:
        Added triggers invocation for DELETE (should be fixed for sure :))
      sql/sql_insert.cc:
        Added triggers invocation for INSERT (should be fixed for sure :))
      sql/sql_lex.cc:
        Added trg_new_row_fake_var variable pointer to which is used for distinguishing between
        assignment to NEW row field (when parsing trigger definition) and structured variable.
        Added initialization of LEX->trg_table to lex_start(). (When triggers are parsed during
        opening of table it points to table object.)
      sql/sql_lex.h:
        Added trigger related commands.
        Added st_trg_chistics structure describing properties of trigger being created
        (as struct and as LEX member).
        Added trg_new_row_fake_var variable pointer to which is used for
        distinguishing between assignment to NEW row field (when parsing trigger definition)
        and structured variable.
        Added LEX::trg_table which points to table being opened when we are parsing trigger
        definition while opening table.
      sql/sql_parse.cc:
        Added support for CREATE/DROP TRIGGER commands.
      sql/sql_table.cc:
        Cleanup. close_cached_table() always returns 0 and its result is not analyzed in most
        places so chenged its return type to void.
      sql/sql_update.cc:
        Added triggers invocation for UPDATE (should be fixed for sure :))
      sql/sql_yacc.yy:
        Added support for CREATE/DROP TRIGGER statements.
        Added support for OLD/NEW row identifiers in trigger.
        Made assignment to user variables not to break execution of stored function or trigger.
      sql/table.h:
        Added TABLE::triggers member representing triggers for this table.
      52ac4935
    • unknown's avatar
      requre BASE TABLE for HANDLER (BUG#5277) · 6e0b468f
      unknown authored
      
      mysql-test/r/view.result:
        HANDLER with VIEW
      mysql-test/t/view.test:
        HANDLER with VIEW
      sql/sql_handler.cc:
        requre BASE TABLE for HANDLER
      6e0b468f