1. 10 Sep, 2004 6 commits
    • unknown's avatar
      post merge fix · a0b7ff7f
      unknown authored
      a0b7ff7f
    • unknown's avatar
      Merge · 28d840f6
      unknown authored
      
      sql/sql_handler.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      28d840f6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 01b88943
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      01b88943
    • unknown's avatar
      thd pointer fixed · 1c373f7c
      unknown authored
      
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      mysql-test/r/merge.result:
        fix of test
      1c373f7c
    • unknown's avatar
      Fixed BUG#3294: Stored procedure crash if table dropped before use. · e5caf6e5
      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).
      e5caf6e5
    • unknown's avatar
      Fixed --with-embedded builds. · 3678fe2a
      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.
      3678fe2a
  2. 09 Sep, 2004 10 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f863f8dc
      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
      f863f8dc
    • unknown's avatar
      post merge fixes · 04e9cd42
      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
      04e9cd42
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aa732512
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-1218-a
      
      
      sql/item_func.h:
        Auto merged
      aa732512
    • unknown's avatar
      After merge fixes for WL#1218 "Triggers" · c5357dd6
      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.
      c5357dd6
    • unknown's avatar
      Fixed BUG#4487: Stored procedure connection aborted if uninitialized char. · 93903260
      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.
      93903260
    • unknown's avatar
      Yet another manual merge with main tree for patch for WL#1218 "Triggers" · 74f0d860
      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.
      74f0d860
    • unknown's avatar
      merge · 4d64a5a6
      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
      4d64a5a6
    • unknown's avatar
      Update after merge · 79637b2c
      unknown authored
      79637b2c
    • unknown's avatar
      Merge on pull · 1de7da1a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_sys.h:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      1de7da1a
    • unknown's avatar
      After merge fixes of merge with 4.1 that included the new arena code. · 74e8c6af
      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
      74e8c6af
  3. 08 Sep, 2004 5 commits
    • unknown's avatar
      WL#1218 "Triggers" · ccbcf94d
      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.
      ccbcf94d
    • unknown's avatar
      Fixed BUG#5000: SPs can be created with no default database. · b1fe1b74
      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()".
      b1fe1b74
    • unknown's avatar
      Fixed BUG#5258: Stored procedure modified date is 0000-00-00. · 82503c58
      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.
      82503c58
    • unknown's avatar
      Merge of changes from the main tree to tree for WL#1218 "Triggers". · c7fdd679
      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.
      c7fdd679
    • unknown's avatar
      test of updating and fetching from the same table check (BUG##5157) · cbdbccaf
      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
      cbdbccaf
  4. 07 Sep, 2004 6 commits
    • unknown's avatar
      returning test environment · 791afd62
      unknown authored
      791afd62
    • unknown's avatar
      ixed table and db name of fields incase of lower_case_table_names (BUG#5154) · 8f57a85f
      unknown authored
      
      sql/item.cc:
        fixed table and db name of fields incase of lower_case_table_names
      8f57a85f
    • unknown's avatar
      Fixed typo that showed up in non-debug build (in sql/sql_show.cc). · 913c09a1
      unknown authored
      
      sql/sql_show.cc:
        Fixed typo that showed up in non-debug build.
      913c09a1
    • unknown's avatar
      support of view to COM_FIELD_LIST added (BUG#5145) · 3cc44ff5
      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
      3cc44ff5
    • unknown's avatar
      WL#1218 "Triggers". Some very preliminary version of patch. · 960c429d
      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.
      960c429d
    • unknown's avatar
      requre BASE TABLE for HANDLER (BUG#5277) · b61e1f7f
      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
      b61e1f7f
  5. 06 Sep, 2004 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9f1f886e
      unknown authored
      into silver_beast.(none):/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      9f1f886e
    • unknown's avatar
      postmerge fix (found by Dmitry) · 0e0a6cce
      unknown authored
      
      sql/item.cc:
        postmerge fix
      0e0a6cce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2efed06e
      unknown authored
      into silver_beast.(none):/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      2efed06e
    • unknown's avatar
      Fixed memory allocation: allocated memory wasn't enough to store the · 1c779410
      unknown authored
      final 0 of the string.
      
      
      mysys/default.c:
        Wrong memory allocation fixed.
      1c779410
    • unknown's avatar
      Merge with 4.1 · 9321f3d8
      unknown authored
      (Includes merge of arena code in 4.1 and 5.0)
      
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      VC++Files/sql/mysqld.dsp:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      libmysql/client_settings.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/ctype_recoding.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/func_like.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/having.result:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/join.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/lowercase_table.result:
        Auto merged
      mysql-test/r/ndb_autodiscover.result:
        Auto merged
      mysql-test/r/null.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/null.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/rpl_charset.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_rename.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/table.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      client/mysqlbinlog.cc:
        Merge with 4.1
      configure.in:
        Merge with 4.1
      include/mysqld_error.h:
        Add new error message (1) from 4.1
      mysql-test/mysql-test-run.sh:
        Merge with 4.1
      mysql-test/r/func_gconcat.result:
        Merge with 4.1
      mysql-test/r/func_if.result:
        Merge with 4.1
      mysql-test/r/grant.result:
        Merge with 4.1
      mysql-test/r/join_outer.result:
        Merge with 4.1
      mysql-test/r/rpl_charset.result:
        Merge with 4.1 (This has to be fixed before pushing)
      mysql-test/r/system_mysql_db.result:
        Merge with 4.1.
        Added collation to new privileges
      mysql-test/t/grant.test:
        Merge with 4.1
      mysql-test/t/grant_cache.test:
        Merge with 4.1
      mysql-test/t/show_check.test:
        Merge with 4.1
      sql/Makefile.am:
        Merge with 4.1
      sql/item.cc:
        Merge with 4.1
      sql/item_cmpfunc.cc:
        Merge with 4.1 (arena code)
      sql/item_subselect.cc:
        Merge with 4.1
      sql/item_subselect.h:
        Merge with 4.1
      sql/item_sum.cc:
        Merge with 4.1
      sql/item_sum.h:
        Merge with 4.1
      sql/log.cc:
        Merge with 4.1 (Remove code that is not relevant for 5.0)
      sql/mysqld.cc:
        Merge with 4.1
      sql/opt_range.cc:
        Merge with 4.1
      sql/share/czech/errmsg.txt:
        Merge with 4.1
      sql/share/danish/errmsg.txt:
        Merge with 4.1
      sql/share/dutch/errmsg.txt:
        Merge with 4.1
      sql/share/english/errmsg.txt:
        Merge with 4.1
      sql/share/estonian/errmsg.txt:
        Merge with 4.1
      sql/share/french/errmsg.txt:
        Merge with 4.1
      sql/share/german/errmsg.txt:
        Merge with 4.1
      sql/share/greek/errmsg.txt:
        Merge with 4.1
      sql/share/hungarian/errmsg.txt:
        Merge with 4.1
      sql/share/italian/errmsg.txt:
        Merge with 4.1
      sql/share/japanese/errmsg.txt:
        Merge with 4.1
      sql/share/korean/errmsg.txt:
        Merge with 4.1
      sql/share/norwegian-ny/errmsg.txt:
        Merge with 4.1
      sql/share/norwegian/errmsg.txt:
        Merge with 4.1
      sql/share/polish/errmsg.txt:
        Merge with 4.1
      sql/share/portuguese/errmsg.txt:
        Merge with 4.1
      sql/share/romanian/errmsg.txt:
        Merge with 4.1
      sql/share/russian/errmsg.txt:
        Merge with 4.1
      sql/share/serbian/errmsg.txt:
        Merge with 4.1
      sql/share/slovak/errmsg.txt:
        Merge with 4.1
      sql/share/spanish/errmsg.txt:
        Merge with 4.1
      sql/share/swedish/errmsg.txt:
        Merge with 4.1
      sql/share/ukrainian/errmsg.txt:
        Merge with 4.1
      sql/sql_base.cc:
        Merge with 4.1
      sql/sql_class.cc:
        Merge with 4.1
        Use arena code from 4.1
      sql/sql_class.h:
        Merge with 4.1
        Use arena code from 4.1
      sql/sql_derived.cc:
        Merge with 4.1
      sql/sql_lex.cc:
        Merge with 4.1
      sql/sql_lex.h:
        Merge with 4.1
      sql/sql_parse.cc:
        Merge with 4.1
      sql/sql_prepare.cc:
        Merge with 4.1
      sql/sql_select.cc:
        Merge with 4.1
      sql/sql_table.cc:
        Merge with 4.1
      sql/sql_union.cc:
        Merge with 4.1
      sql/sql_yacc.yy:
        Merge with 4.1
      sql/tztime.cc:
        Merge with 4.1
      tests/client_test.c:
        Merge with 4.1
      9321f3d8
    • unknown's avatar
      do not use Item_ref for view fields if it is UPDATE of INSERT (BUG#5263) · f1fa0d87
      unknown authored
      
      mysql-test/r/view.result:
        INSERT into VIEW with ON DUPLICATE
      mysql-test/t/view.test:
        INSERT into VIEW with ON DUPLICATE
      sql/sql_insert.cc:
        do not use Item_ref for view fields if it is UPDATE of INSERT
      f1fa0d87
  6. 05 Sep, 2004 2 commits
  7. 04 Sep, 2004 5 commits
    • unknown's avatar
      After merge fixes · 27ae2ad4
      unknown authored
      27ae2ad4
    • unknown's avatar
      memory leaks fixed · 2452489c
      unknown authored
      
      sql/sql_derived.cc:
        memory leak fixed
      sql/sql_view.cc:
        memory leak fixed
      2452489c
    • unknown's avatar
      Merge with 4.0 to get latest bug fixes · 76c986bc
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        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/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/romanian/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
      mysql-test/r/union.result:
        Merge with 4.0
      mysql-test/t/union.test:
        Merge with 4.0
      sql/ha_innodb.cc:
        Merge with 4.0
      sql/share/german/errmsg.txt:
        Merge with 4.0
      sql/share/portuguese/errmsg.txt:
        Merge with 4.0
      sql/share/russian/errmsg.txt:
        Merge with 4.0
      sql/sql_parse.cc:
        Merge with 4.0
      sql/sql_union.cc:
        Merge with 4.0 (Keep 4.1 code)
      76c986bc
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 64c00385
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.h:
        Auto merged
      64c00385
    • unknown's avatar
      Print value of Item_param if it has a value (when debugging) · 7e49a21c
      unknown authored
      
      libmysql/libmysql.c:
        More debug
      sql/item.h:
        Print value of param if it has a value (when debugging)
      sql/log.cc:
        Better variable name
      sql/sql_insert.cc:
        Fix bug casused by merge
      sql/sql_parse.cc:
        Added missing command names (caused crash when running with --debug)
      sql/sql_select.cc:
        More debugging
      sql/sql_yacc.yy:
        Fixed typo
      tests/client_test.c:
        More debugging
      7e49a21c