An error occurred fetching the project authors.
  1. 11 Jul, 2006 1 commit
    • unknown's avatar
      WL#3337 (Event scheduler new architecture) · 14c00d3c
      unknown authored
      More small fixes to the API : use LEX_STRING instead of LEX_STRING* and if error
      then return bool(true) instead of error code.
      Merged functions. Reduced usage of sp_name.
      Fixed a lot of function documentation errors.
      Added function documentation wherever needed.
      Removed some unused defines and error codes.
      
      Next to come is batch rename of Event_scheduler_ng to Event_scheduler.
      
      
      mysql-test/r/events.result:
        update result
      mysql-test/r/events_logs_tests.result:
        update result
      mysql-test/t/events.test:
        more test coverage
      mysql-test/t/events_logs_tests.test:
        fix test
      sql/event_data_objects.cc:
        Cosmetics.
        Fix function documentation whenever needed.
        Move Event_job_data::compile() next to Event_job_data::execute()
      sql/event_data_objects.h:
        Remove unneeded error codes and defines
        Move function declarations at the end of the header
      sql/event_db_repository.cc:
        Fix function documentation.
        Event_db_repository::update_event() now uses LEX_STRING *-s instead of
        sp_name . Lower coupling.
      sql/event_db_repository.h:
        Event_db_repository::update_event() now uses LEX_STRING *-s instead of
        sp_name . Lower coupling.
        find_event -> find_named_event
        find_event_by_name is not used externally, merge with load_named_event()
      sql/event_queue.cc:
        LEX_STRING* to LEX_STRING
        Fix comments.
        Fix and add function documentation.
        Remove Event_queue::events_count() as it is unused
        Change get_top_for_execution_if_time() to return status code as return value
        and the object is in out parameter.
      sql/event_queue.h:
        LEX_STRING* to LEX_STRING
        Fix comments.
        Fix and add function documentation.
        Remove Event_queue::events_count() as it is unused
        Change get_top_for_execution_if_time() to return status code as return value
        and the object is in out parameter.
        Try to detect also lock attemptions for deadlocks.
      sql/event_scheduler_ng.cc:
        Always execute on thd->mem_root
        Fix according to changed API of Event_queue::get_top_for_execution_if_time()
      sql/events.cc:
        Fix function documentation.
        Fix code after API changes of internal Event module classes.
      sql/events.h:
        sp_name -> LEX_STRINGs
      sql/sql_parse.cc:
        Fix according to changed API of Events::show_create_event()
      sql/sql_yacc.yy:
        Don't pass NULL as third parameter to sp_head::init_strings()
      14c00d3c
  2. 10 Jul, 2006 1 commit
    • unknown's avatar
      WL#3337 (Event scheduler new architecture) · 772eddf0
      unknown authored
      This patch introduces specialized Event data objects
      Event_basic as parent.
      Event_queue_element used for queue storage
      Event_timed used for SHOW EVENTS/ I_S.EVENTS / SHOW CREATE EVENT
      Event_job_data using during execution.
      Methods were moved out of Event_timed to other classes.
      
      This patch also introduces Events::LOCK_event_metadata.
      This patch gives new implementation of Events::dump_internal_status().
      Now both the Event_scheduler and Event_queue return information during
      their ::dump_internal_status().
      
      Shortened a bit the runtime for executing events test cases.
      
      
      mysql-test/r/events.result:
        update results
      mysql-test/r/events_bugs.result:
        update results
      mysql-test/r/events_logs_tests.result:
        update results
      mysql-test/r/events_scheduling.result:
        update results
      mysql-test/t/events.test:
        update test
        make --sleep more appropriate . saving some time could mean failure on loaded boxes though :(
        add tests for previously uncovered branches.
      mysql-test/t/events_bugs.test:
        update test
        make --sleep more appropriate . saving some time could mean failure on loaded boxes though :(
        add tests for previously uncovered branches.
      mysql-test/t/events_logs_tests.test:
        make the test shorter by time
      mysql-test/t/events_scheduling.test:
        when selecting always use ORDER BY
      mysql-test/t/events_stress.test:
        sleep 2.5secs for shorter stress test
      sql/event_data_objects.cc:
        Event_timed is no more used during execution.
        Event_timed is no more used during in the memory queue.
        Event_timed is only used for SHOW CREATE EVENT/ I_S.EVENTS/ SHOW EVENTS
        Event_basic is the parent of almost all Event data objects.
        Event_basic -> Event_queue_element (used for the memory queue) -> Event_timed
        Event_basic -> Event_job_data (the object used for execution)
        Sql_alloc -> Event_parse_data (used during parsing)
      sql/event_data_objects.h:
        Event_timed is no more used during execution.
        Event_timed is no more used during in the memory queue.
        Event_timed is only used for SHOW CREATE EVENT/ I_S.EVENTS/ SHOW EVENTS
        Event_basic is the parent of almost all Event data objects.
        Event_basic -> Event_queue_element (used for the memory queue) -> Event_timed
        Event_basic -> Event_job_data (the object used for execution)
        Sql_alloc -> Event_parse_data (used during parsing)
      sql/event_db_repository.cc:
        Cosmetics.
        load_named_event now uses Event_basic, for polymorphism
        find_event uses Event_basic, to be polymorphic.
        use Field **fields= table->field and then index fields[...]
        Add documentation.
        Fix documentation.
      sql/event_db_repository.h:
        Event_db_repository depends only on Event_basic's interface
      sql/event_queue.cc:
        Cosmetics.
        Don't use Event_timed for the queue and giving back object for execution.
        Event_queue_element is for the queue, Event_job_data is for execution.
        Add Event_queue::dump_internal_status() for SHOW SCHEDULER STATUS command
      sql/event_queue.h:
        Cosmetics.
        Don't use Event_timed for the queue and giving back object for execution.
        Event_queue_element is for the queue, Event_job_data is for execution.
        Add Event_queue::dump_internal_status() for SHOW SCHEDULER STATUS command
      sql/event_scheduler_ng.cc:
        Add back Event_scheduler::cond_wait()
        Add back Event_scheduler::dump_internal_status()
        Using Event_job_data for execution. Make the scheduler thread unkillable (thd->command= COM_DAEMON).
        Add a lot of documentation.
      sql/event_scheduler_ng.h:
        Add back Event_scheduler::cond_wait()
        Add back Event_scheduler::dump_internal_status()
        Using Event_job_data for execution.
      sql/events.cc:
        Documentation
        Add LOCK_event_metadata
      sql/events.h:
        Change the signature of Events::drop_event() not to use sp_name but LEX_STRING
      sql/share/errmsg.txt:
        Fix error message
      sql/sql_parse.cc:
        Events::drop_event() has new signature
      772eddf0
  3. 06 Jul, 2006 1 commit
    • unknown's avatar
      After merge fixes. · f78f7f84
      unknown authored
      sql/event_timed.cc:
        After merge fixes: dbname can never be NULL.
      sql/events.cc:
        After merge fixes: use a new signature of sp_use_new_db
      sql/sp_head.cc:
        After merge fixes: replace assert with an if for events code to work.
      sql/sql_parse.cc:
        After merge fixes: put back free_items, it's used in partitioning.
        Whether it is not a bug is to be investigated.
        Remove check_db_used, as planned.
      f78f7f84
  4. 05 Jul, 2006 1 commit
    • unknown's avatar
      WL#3337 (Event scheduler new architecture) · 4a3c079b
      unknown authored
      Cleaned up the code a bit. Fixed few leaks.
      This code still does not load events on server startup
      from disk. The problem is that there is a need for a THD instance, which
      does not exist during server boot. This will be solved soon.
      Still Event_timed is used both for the memory queue and for exectution.
      This will be changed according to WL#3337 probably in the next commit.
      
      
      sql/event_data_objects.cc:
        Strip unneeded stuff from class Event_timed
        Event_timed is still used for the queue and execution.
        That will be changed in the next commit.
      sql/event_data_objects.h:
        Strip unneeded stuff from class Event_timed
        Event_timed is still used for the queue and execution.
        That will be changed in the next commit.
      sql/event_db_repository.cc:
        Cosmetics.
        Add a new method load_named_event_job, to be made complete in the 
        next commit. It will load from disk an instance of Event_job_data to
        be used during execution.
      sql/event_db_repository.h:
        find_event does not need MEM_ROOT anymore
        because the memory is allocated on Event's own root.
      sql/event_queue.cc:
        Remove dead code.
        Move dumping of the queue to separate method.
        Make critical sections in create_event & update_event
        as small as possible - load the new event outside of the section
        and free the object also outside of it.
      sql/event_queue.h:
        init -> init_queue -> easier for ctags
        deinit -> deinit_queue -> easier for ctags
      sql/event_scheduler.cc:
        empty this file
      sql/event_scheduler.h:
        empty this file
      sql/event_scheduler_ng.cc:
        add back DBUG_RETURN(0) in thread handlers.
        We don't stop running events when stopping the scheduler. Therefore
        remove this method now. If it is needed later it can be added back.
      sql/event_scheduler_ng.h:
        Remove stop_all_running_threads()
        init -> init_scheduler
        deinit -> deinit_scheduler
        easier for ctags
      sql/events.cc:
        Cosmetics
      sql/events.h:
        Cosmetics
      sql/set_var.cc:
        Remove references to dead code
      sql/sql_parse.cc:
        Reorganize a bit.
      4a3c079b
  5. 01 Jul, 2006 1 commit
    • unknown's avatar
      Fix for bug#18437 "Wrong values inserted with a before update trigger on · ac957070
      unknown authored
      NDB table".
      
      SQL-layer was not marking fields which were used in triggers as such. As
      result these fields were not always properly retrieved/stored by handler
      layer. So one might got wrong values or lost changes in triggers for NDB,
      Federated and possibly InnoDB tables.
      This fix solves the problem by marking fields used in triggers
      appropriately.
      
      Also this patch contains the following cleanup of ha_ndbcluster code:
      
      We no longer rely on reading LEX::sql_command value in handler in order
      to determine if we can enable optimization which allows us to handle REPLACE
      statement in more efficient way by doing replaces directly in write_row()
      method without reporting error to SQL-layer.
      Instead we rely on SQL-layer informing us whether this optimization
      applicable by calling handler::extra() method with
      HA_EXTRA_WRITE_CAN_REPLACE flag.
      As result we no longer apply this optimzation in cases when it should not
      be used (e.g. if we have on delete triggers on table) and use in some
      additional cases when it is applicable (e.g. for LOAD DATA REPLACE).
      
      Finally this patch includes fix for bug#20728 "REPLACE does not work
      correctly for NDB table with PK and unique index".
        
      This was yet another problem which was caused by improper field mark-up.
      During row replacement fields which weren't explicity used in REPLACE
      statement were not marked as fields to be saved (updated) so they have
      retained values from old row version. The fix is to mark all table
      fields as set for REPLACE statement. Note that in 5.1 we already solve
      this problem by notifying handler that it should save values from all
      fields only in case when real replacement happens.
      
      
      include/my_base.h:
        Added HA_EXTRA_WRITE_CAN_REPLACE, HA_EXTRA_WRITE_CANNOT_REPLACE - new
        parameters for ha_extra() method. We use them to inform handler that
        write_row() which tries to insert new row into the table and encounters
        some already existing row with same primary/unique key can replace old
        row with new row instead of reporting error.
      mysql-test/r/federated.result:
        Additional test for bug#18437 "Wrong values inserted with a before update
        trigger on NDB table".
      mysql-test/r/ndb_replace.result:
        Added test for bug #20728 "REPLACE does not work correctly for NDB table
        with PK and unique index". Updated wrong results from older test.
      mysql-test/t/federated.test:
        Additional test for bug#18437 "Wrong values inserted with a before update
        trigger on NDB table".
      mysql-test/t/ndb_replace.test:
        Added test for bug #20728 "REPLACE does not work correctly for NDB table
        with PK and unique index".
      sql/ha_ndbcluster.cc:
        We no longer rely on reading LEX::sql_command value in handler in order
        to determine if we can enable optimization which allows us to handle REPLACE
        statement in more efficient way by doing replaces directly in write_row()
        method without reporting error to SQL-layer.
        Instead we rely on SQL-layer informing us whether this optimization
        applicable by calling handler::extra() method with
        HA_EXTRA_WRITE_CAN_REPLACE flag.
        As result we no longer apply this optimization in cases when it should not
        be used (e.g. if we have on delete triggers on table) and use in some
        additional cases when it is applicable (e.g. for LOAD DATA REPLACE).
      sql/item.cc:
        Item_trigger_field::setup_field():
          Added comment explaining why we don't set Field::query_id in this method.
      sql/mysql_priv.h:
        mysql_alter_table() function no longer takes handle_duplicates argument.
        Added declaration of mark_fields_used_by_triggers_for_insert_stmt() function.
      sql/sql_delete.cc:
        Mark fields which are used by ON DELETE triggers so handler will retrieve
        values for these fields.
      sql/sql_insert.cc:
        Explicitly inform handler that we are doing REPLACE (using ha_extra() method)
        in cases when it can promote insert operation done by write_row() to replace.
        Also when we do REPLACE we want to store values for all columns so we should
        inform handler about it.
        Finally we should mark fields used by ON UPDATE/ON DELETE triggers as such
        so handler can properly retrieve/restore values in these fields during
        execution of REPLACE and INSERT ... ON DUPLICATE KEY UPDATE statements.
      sql/sql_load.cc:
        Explicitly inform handler that we are doing LOAD DATA REPLACE (using
        ha_extra() method) in cases when it can promote insert operation done by
        write_row() to replace.
        Also when we do replace we want to save (replace) values for all columns
        so we should inform handler about it.
        Finally to properly execute LOAD DATA for table with triggers we should
        mark fields used by ON INSERT triggers as such so handler can properly
        store values for these fields.
      sql/sql_parse.cc:
        mysql_alter_table() function no longer takes handle_duplicates argument.
      sql/sql_table.cc:
        Got rid of handle_duplicates argument in mysql_alter_table() and
        copy_data_between_tables() functions. These functions were always
        called with handle_duplicates == DUP_ERROR and thus contained dead
        (and probably incorrect) code.
      sql/sql_trigger.cc:
        Added Table_triggers_list::mark_fields_used() method which is used to mark
        fields read/set by triggers as such so handlers will be able properly
        retrieve/store values in these fields.
      sql/sql_trigger.h:
        Table_triggers_list:
          Added mark_fields_used() method which is used to mark fields read/set by
          triggers as such so handlers will be able properly retrieve/store values
          in these fields. To implement this method added 'trigger_fields' member
          which is array of lists linking items for all fields used in triggers
          grouped by event and action time.
      sql/sql_update.cc:
        Mark fields which are used by ON UPDATE triggers so handler will retrieve
        and save values for these fields.
      mysql-test/r/ndb_trigger.result:
        Added test for bug#18437 "Wrong values inserted with a before update trigger
        on NDB table".
      mysql-test/t/ndb_trigger.test:
        Added test for bug#18437 "Wrong values inserted with a before update trigger
        on NDB table".
      ac957070
  6. 28 Jun, 2006 2 commits
    • unknown's avatar
      WL#3337 (Events new architecture) · 7ef47980
      unknown authored
      This cut No 7 should finish the part of fixing the parsing of the events :
      - Event_timed is no more used during parsing. Less problems because it has
        a mutex. Event_parse_data class is used during parsing. It is suited only
        for this purpose. It's pretty lightweight
      - Late checking of data from parsing is being performed. This should solve
        the problems of nested events in SP or other events (for the situation 
        of no nested bodies). Before if an ALTER EVENT was in a SP, then when the
        SP was compiled, and not executed, the actual init_xxx methods of Event_timed
        were called, which is wrong.
      - It could be a side effect of using a specialized class, but test events_stress is
        now 25% quicker.
      
      Cut No8 will start splitting Event_scheduler into 2 parts, the QUEUE will be moved
      to Event_queue.
      
      
      mysql-test/r/events.result:
        update result
      mysql-test/t/events.test:
        disabled is actually wrong, should be disable, but because of the early
        checking it was never parsed.
      sql/event_data_objects.cc:
        move add init_xxx methods from Event_timed to Event_parse_data
        Event_parse data does not need definer_user and definer_host
        in Event_timed::compile() do not use lex.et, well there is no more lex.et :)
      sql/event_data_objects.h:
        move parsing responsibilities from Event_timed to Event_parse_data
      sql/event_db_repository.cc:
        No more Event_timed comes from parsing but Event_parse_data
        The initialization of Item*-s from parsing is done late, and not
        during the actual parsing. This is the right way to go because
        if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
        executed (initialized) during parsing, as it was done.
      sql/event_db_repository.h:
        No more Event_timed comes from parsing but Event_parse_data
        The initialization of Item*-s from parsing is done late, and not
        during the actual parsing. This is the right way to go because
        if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
        executed (initialized) during parsing, as it was done.
      sql/event_scheduler.cc:
        No more Event_timed comes from parsing but Event_parse_data
        The initialization of Item*-s from parsing is done late, and not
        during the actual parsing. This is the right way to go because
        if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
        executed (initialized) during parsing, as it was done.
      sql/event_scheduler.h:
        No more Event_timed comes from parsing but Event_parse_data
        The initialization of Item*-s from parsing is done late, and not
        during the actual parsing. This is the right way to go because
        if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
        executed (initialized) during parsing, as it was done.
      sql/events.cc:
        No more Event_timed comes from parsing but Event_parse_data
        The initialization of Item*-s from parsing is done late, and not
        during the actual parsing. This is the right way to go because
        if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
        executed (initialized) during parsing, as it was done.
      sql/events.h:
        No more Event_timed comes from parsing but Event_parse_data
        The initialization of Item*-s from parsing is done late, and not
        during the actual parsing. This is the right way to go because
        if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
        executed (initialized) during parsing, as it was done.
      sql/sql_lex.cc:
        lex->et_compile_phase and lex->et are no more.
        Use lex->event_parse_data
      sql/sql_lex.h:
        lex->et_compile_phase and lex->et are no more.
        Use lex->event_parse_data
      sql/sql_parse.cc:
        lex->et_compile_phase and lex->et are no more.
        Use lex->event_parse_data
        ACL checks were moved inside the Events subsystem.
        Also ending of the transaction is performed only just
        before doing disk operation. Therefore only when needed.
      sql/sql_yacc.yy:
        lex->et and lex->et_parse_phase are no more
        Use the specialized for parsing Event_parse_data
      7ef47980
    • unknown's avatar
      Added purecov comment for new, not executed code for my recent changeset · 800398c9
      unknown authored
      (Found by dgcov)
      
      
      mysql-test/r/show_check.result:
        Test SHOW PLUGIN.
        (Was not covered by test suite before)
      mysql-test/t/show_check.test:
        Test SHOW PLUGIN.
        (Was not covered by test suite before)
      mysys/my_handler.c:
        Added purecov comment for new, not executed code
      sql/filesort.cc:
        Added purecov comment for new, not executed code
        Removed 'purecov: inspected' from code covered by current testsuite
      sql/ha_ndbcluster_binlog.cc:
        Added purecov comment for new, not executed code
      sql/log_event.cc:
        Added purecov comment for new, not executed code
      sql/mysqld.cc:
        Added purecov comment for new, not executed code
      sql/sql_parse.cc:
        Added purecov comment for new, not executed code
      800398c9
  7. 27 Jun, 2006 4 commits
    • unknown's avatar
      WL#3337 (Events new architecture) · 5e0640e8
      unknown authored
      5th cut, moved DB related code to Event_db_repository and
      updated accordingly the remanining code.
      Moved change/restore_security_context() to class THD
      Removed events_priv.h
      Next step is to reorganize create/update_event() and parsing for them.
      But probably some other refactoring could be done in the meanwhile.
      The changes so far pass the test suite.
      
      
      BitKeeper/deleted/.del-events_priv.h~2e8bce2cf35997df:
        Delete: sql/events_priv.h
      sql/Makefile.am:
        events_priv.h is no more
      sql/event_data_objects.cc:
        reorganize events code
      sql/event_data_objects.h:
        reorganize events code
      sql/event_db_repository.cc:
        reorganize events code
      sql/event_db_repository.h:
        reorganize events code
      sql/event_scheduler.cc:
        reorganize events code
      sql/event_scheduler.h:
        reorganize events code
      sql/events.cc:
        reorganize events code
      sql/events.h:
        reorganize events code
      sql/mysqld.cc:
        reorganize events code
      sql/set_var.cc:
        reorganize events code
      sql/sql_class.cc:
        add ::change_security_context() and restore_security_context()
      sql/sql_class.h:
        add ::change_security_context() and restore_security_context()
      sql/sql_db.cc:
        reorganize Events code
      sql/sql_parse.cc:
        reorganize Events code
      sql/sql_show.cc:
        reorganize Events code
      5e0640e8
    • unknown's avatar
      WL#3337 (Event scheduler new architecture) · 810d8e21
      unknown authored
      Third cut to simplify parsing phase. Now DROP EVENT works.
      
      Overloaded few functions to be able to use either sp_name or pass two LEX_STRINGs
      instead of a Event_timed pointer. This is transitional and eventually the old
      functions will be removed. For now DROP EVENT also works, does not need anymore
      a parsing object (Event_timed) and definer initialization because everyone who
      has EVENT_ACL can drop events, and this is checked on execution time in sql_parse.cc
      from the security context, as it should be.
      
      
      sql/event_data_objects.cc:
        overload few functions
      sql/event_scheduler.cc:
        Event_scheduler::drop_event() actually does not need Event_timed object
        but just an identifier, hence pass only sp_name.
        
        Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually
        the old version will be removed. This is being done as transitional step to
        be able to test frequently code.
      sql/event_scheduler.h:
        Event_scheduler::drop_event() actually does not need Event_timed object
        but just an identifier, hence pass only sp_name.
        
        Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually
        the old version will be removed. This is being done as transitional step to
        be able to test frequently code.
      sql/events.cc:
        Change db_drop_event() not to use Event_timed, either coming from parsing
        or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient
        because in Event_timed::drop a temporary object has to be created. Hence, 
        dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs.
      sql/events.h:
        Change db_drop_event() not to use Event_timed, either coming from parsing
        or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient
        because in Event_timed::drop a temporary object has to be created. Hence, 
        dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs.
      sql/events_priv.h:
        Change db_drop_event() not to use Event_timed, either coming from parsing
        or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient
        because in Event_timed::drop a temporary object has to be created. Hence, 
        dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs.
      sql/sql_parse.cc:
        SQLCOM_DROP_EVENT does not need lex->event_parse_data object and 
        is more like SQLCOM_SHOW_CREATE_EVENT. Therefore, move it to the block that
        handles the latter.
      sql/sql_yacc.yy:
        DROP EVENT does not need a parsing object, just a name.
        Store it as lex->spname. Pretty similar handling to the one of
        SHOW CREATE EVENT.
      810d8e21
    • unknown's avatar
      WL#3337 (Events new infrasctructure) · fd91a6f2
      unknown authored
      Second cut of separating parsing phase from execution phase
      Separate Event_timed from parsing phase and introducing Event_parse_data.
      
      
      sql/event_data_objects.cc:
        second cut,
        copy Event_timed::init_body() to Event_parse_data::init_body()
        Init the body during parsing, everything else keep as a pointer to
        Item or some other pointer to use for later initialization.
      sql/event_data_objects.h:
        get the identifier as sp_name*, later will initialize our structures
      sql/events.cc:
        for easy transition add temporarily parse_data, later Event_timed *et will be removed.
        Do slow transition because Event_timed is so tightly integrated that a front-attack
        by removing things from this class was unsuccessful. Do things step by step by eliminating
        dependencies. Hence, the code could be checked with the current test suite too
        (early testing)
      sql/events.h:
        for easy transition add temporarily parse_data, later Event_timed *et will be removed.
        Do slow transition because Event_timed is so tightly integrated that a front-attack
        by removing things from this class was unsuccessful. Do things step by step by eliminating
        dependencies. Hence, the code could be checked with the current test suite too
        (early testing)
      BitKeeper/etc/ignore:
        Added libmysql/viosocket.o.6WmSJk libmysqld/event_data_objects.cc libmysqld/event_db_repository.cc libmysqld/event_queue.cc server-tools/instance-manager/net_serv.cc to the ignore list
      sql/share/errmsg.txt:
        remove this message, not used and needed for now
      sql/sql_lex.h:
        for easy transition add temporarily parse_data, later Event_timed *et will be removed.
        Do slow transition because Event_timed is so tightly integrated that a front-attack
        by removing things from this class was unsuccessful. Do things step by step by eliminating
        dependencies. Hence, the code could be checked with the current test suite too
        (early testing)
      sql/sql_parse.cc:
        for easy transition add temporarily parse_data, later Event_timed *et will be removed.
        Do slow transition because Event_timed is so tightly integrated that a front-attack
        by removing things from this class was unsuccessful. Do things step by step by eliminating
        dependencies. Hence, the code could be checked with the current test suite too
        (early testing)
      sql/sql_yacc.yy:
        for easy transition add temporarily parse_data, later Event_timed *et will be removed.
        Do slow transition because Event_timed is so tightly integrated that a front-attack
        by removing things from this class was unsuccessful. Do things step by step by eliminating
        dependencies. Hence, the code could be checked with the current test suite too
        (early testing)
      fd91a6f2
    • unknown's avatar
      first cut of WL#3337 (New event scheduler locking infrastructure). · 2ca34120
      unknown authored
      Infrastructure built. Added the  foreseen files and change Makefile.am/CMakeLists.txt
      accordingly.
      
      
      libmysqld/Makefile.am:
        add new files. this is first cut of WL3337u
      sql/CMakeLists.txt:
        add more files to build
      sql/Makefile.am:
        add new files. this is first cut of WL3337
      sql/event_scheduler.cc:
        event_timed.h -> event_data_objects.h (WL#3337)
      sql/events.cc:
        event_timed.h -> event_data_objects.h (WL#3337)
      sql/share/errmsg.txt:
        new error message
      sql/event_data_objects.cc:
        event_timed.h -> event_data_objects.h (WL#3337)
      sql/event_data_objects.h:
        event_timed.h -> event_data_objects.h (WL#3337)
      sql/sql_parse.cc:
        event_timed.h -> event_data_objects.h (WL#3337)
      sql/sql_show.cc:
        event_timed.h -> event_data_objects.h (WL#3337)
      sql/sql_yacc.yy:
        event_timed.h -> event_data_objects.h (WL#3337)
      2ca34120
  8. 26 Jun, 2006 2 commits
    • unknown's avatar
      A fix and a test case for · 2783fc82
      unknown authored
       Bug#19022 "Memory bug when switching db during trigger execution"
       Bug#17199 "Problem when view calls function from another database."
       Bug#18444 "Fully qualified stored function names don't work correctly in
                  SELECT statements"
      
       Documentation note: this patch introduces a change in behaviour of prepared
       statements.
      
       This patch adds a few new invariants with regard to how THD::db should
       be used. These invariants should be preserved in future:
      
        - one should never refer to THD::db by pointer and always make a deep copy
          (strmake, strdup)
        - one should never compare two databases by pointer, but use strncmp or
          my_strncasecmp
        - TABLE_LIST object table->db should be always initialized in the parser or
          by creator of the object.
      
          For prepared statements it means that if the current database is changed
          after a statement is prepared, the database that was current at prepare
          remains active. This also means that you can not prepare a statement that
          implicitly refers to the current database if the latter is not set.
          This is not documented, and therefore needs documentation. This is NOT a
          change in behavior for almost all SQL statements except:
           - ALTER TABLE t1 RENAME t2 
           - OPTIMIZE TABLE t1
           - ANALYZE TABLE t1
           - TRUNCATE TABLE t1 --
           until this patch t1 or t2 could be evaluated at the first execution of
           prepared statement. 
      
           CURRENT_DATABASE() still works OK and is evaluated at every execution
           of prepared statement.
      
           Note, that in stored routines this is not an issue as the default
           database is the database of the stored procedure and "use" statement
           is prohibited in stored routines.
      
        This patch makes obsolete the use of check_db_used (it was never used in the
        old code too) and all other places that check for table->db and assign it
        from THD::db if it's NULL, except the parser.
      
       How this patch was created: THD::{db,db_length} were replaced with a
       LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
       manually checked and:
        - if the place uses thd->db by pointer, it was fixed to make a deep copy
        - if a place compared two db pointers, it was fixed to compare them by value
          (via strcmp/my_strcasecmp, whatever was approproate)
       Then this intermediate patch was used to write a smaller patch that does the
       same thing but without a rename.
      
       TODO in 5.1:
         - remove check_db_used
         - deploy THD::set_db in mysql_change_db
      
       See also comments to individual files.
      
      
      mysql-test/r/create.result:
        Modify the result file: a database can never be NULL.
      mysql-test/r/ps.result:
        Update test results (Bug#17199 et al)
      mysql-test/r/sp.result:
        Update test results (Bug#17199 et al)
      mysql-test/t/create.test:
        Update the id of the returned error.
      mysql-test/t/ps.test:
        Add test coverage for prepared statements and current database. In scope of
        work on Bug#17199 "Problem when view calls function from another database."
      mysql-test/t/sp.test:
        Add a test case for Bug#17199 "Problem when view calls function from another
        database." and Bug#18444 "Fully qualified stored function names don't work
        correctly in SELECT statements". Test a complementary problem.
      sql/item_strfunc.cc:
        Touch the code that reads thd->db (cleanup).
      sql/log_event.cc:
        While we are at it, replace direct access to thd->db with a method.
        Should simplify future conversion of THD::db to LEX_STRING.
      sql/slave.cc:
        While we are at it, replace direct access to thd->db with a method.
        Should simplify future conversion of THD::db to LEX_STRING.
      sql/slave.h:
        Remove a declaration for a method that is used only in one module.
      sql/sp.cc:
        Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
        this function and ensure that it has no bugs.
      sql/sp.h:
        Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.
      sql/sp_head.cc:
        - drop sp_name_current_db_new - a creator of sp_name class that was used
        when sp_name was created for an identifier without an explicitly initialized
        database. Now we pass thd->db to constructor of sp_name right in the 
        parser.
        - rewrite sp_head::init_strings: name->m_db is always set now
        - use the new variant of sp_use_new_db
        - we don't need to update thd->db with SP MEM_ROOT pointer anymore when
        parsing a stored procedure, as noone will refer to it (yes!)
      sql/sp_head.h:
        - remove unneded methods and members
      sql/sql_class.h:
        - introduce 3 THD  methods to work with THD::db:
          .set_db to assign the current database
          .reset_db to reset the current database (temporarily) or set it to NULL
          .opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL
      sql/sql_db.cc:
        While we are at it, replace direct access to thd->db with a method.
        Should simplify future conversion of THD::db to LEX_STRING.
      sql/sql_insert.cc:
        - replace checks with asserts: table_list->db must be always set in the parser.
      sql/sql_lex.h:
        - add a comment
      sql/sql_parse.cc:
        - implement the invariant described in the changeset comment.
        - remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
          now db_load_routine uses its own LEX object and doesn't damage the main
          LEX.
        - add DBUG_ASSERT(0) to unused "check_db_used"
      sql/sql_table.cc:
        - replace a check with an assert (table_ident->db)
      sql/sql_trigger.cc:
        While we are at it, replace direct access to thd->db with a method.
        Should simplify future conversion of THD::db to LEX_STRING.
      sql/sql_udf.cc:
        - use thd->set_db instead of direct modification of to thd->db
      sql/sql_view.cc:
        - replace a check with an assert (view->db)
      sql/sql_yacc.yy:
        - make sure that we always copy table->db or name->db or ident->db or
          select_lex->db from thd->db if the former is not set. If thd->db
          is not set but is accessed, return an error.
      sql/tztime.cc:
        - be nice, never copy thd->db by pointer.
      2783fc82
    • unknown's avatar
      Bug#16986 - Deadlock condition with MyISAM tables · e6d5fe0f
      unknown authored
      Addendum fixes after changing the condition variable
      for the global read lock.
      
      The stress test suite revealed some deadlocks. Some were
      related to the new condition variable (COND_global_read_lock)
      and some were general problems with the global read lock.
      
      It is now necessary to signal COND_global_read_lock whenever 
      COND_refresh is signalled.
      
      We need to wait for the release of a global read lock if one 
      is set before every operation that requires a write lock.
      But we must not wait if we have locked tables by LOCK TABLES.
      After setting a global read lock a thread waits until all
      write locks are released.
      
      
      mysql-test/r/lock_multi.result:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Added test results.
      mysql-test/t/lock_multi.test:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Added tests for possible deadlocks that did not occur
        with the stress test suite.
      mysys/thr_lock.c:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Added a protection against an infinite loop that occurs
        with the test case for Bug #20662.
      sql/lock.cc:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Signal COND_global_read_lock whenever COND_refresh
        is signalled by using the new function broadcast_refresh().
        Added the definition of a new function that signals 
        COND_global_read_lock whenever COND_refresh is signalled.
      sql/mysql_priv.h:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Added a declaration for a new function that signals 
        COND_global_read_lock whenever COND_refresh is signalled.
      sql/sql_base.cc:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Signal COND_global_read_lock whenever COND_refresh
        is signalled by using the new function broadcast_refresh().
      sql/sql_handler.cc:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Signal COND_global_read_lock whenever COND_refresh
        is signalled by using the new function broadcast_refresh().
      sql/sql_insert.cc:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Removed global read lock handling from inside of 
        INSERT DELAYED. It is handled on a higher level now.
      sql/sql_parse.cc:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Wait for the release of a global read lock if one is set
        before every operation that requires a write lock.
        But don't wait if locked tables exist already.
      sql/sql_table.cc:
        Bug#16986 - Deadlock condition with MyISAM tables
        Addendum fixes after changing the condition variable
        for the global read lock.
        Removed global read lock handling from inside of 
        CREATE TABLE. It is handled on a higher level now.
        Signal COND_global_read_lock whenever COND_refresh
        is signalled by using the new function broadcast_refresh().
      e6d5fe0f
  9. 23 Jun, 2006 1 commit
    • unknown's avatar
      Fix for bug #18897 "Events: unauthorized action possible with · 2b276ab2
      unknown authored
      alter event rename".
      
      ALTER EVENT ... RENAME statement hasn't checked privileges
      for the target database. It also caused server crashes when
      target database was not specified explicitly and there was
      no current database.
      
      This fix adds missing privilege check and check for the case
      when target database is not specified explicitly or implicitly.
      
      
      mysql-test/r/events_bugs.result:
        update result
      mysql-test/t/events_bugs.test:
        add test case for bug 18897 Events: unauthorized action possible with alter event
        rename:
        - test rename to db the user does not have access to
        - test rename when there is no selected db
      sql/sql_parse.cc:
        Additional check for the situation when no db is selected.
        CREATE EVENT abc and ALTER EVENT db.abc RENAME TO xyz,
        and DROP EVENT abc
        won't work if there is no selected DB.
      2b276ab2
  10. 21 Jun, 2006 3 commits
    • unknown's avatar
      BUG#19309: Problem with calling proecdures twice · eecd3f13
      unknown authored
      Need to flag when a copy is needed to not overwrite a create_info
      object connected to the lex structure
      
      
      sql/mysql_priv.h:
        Need to flag when a copy is needed to not overwrite a create_info
        object connected to the lex structure
      sql/sql_insert.cc:
        Need to flag when a copy is needed to not overwrite a create_info
        object connected to the lex structure
      sql/sql_parse.cc:
        Need to flag when a copy is needed to not overwrite a create_info
        object connected to the lex structure
      sql/sql_table.cc:
        Need to flag when a copy is needed to not overwrite a create_info
        object connected to the lex structure
      eecd3f13
    • unknown's avatar
      Fixed typo that was forgot in last changeset. · b173dffa
      unknown authored
      b173dffa
    • unknown's avatar
      Bug #20482: failure on Create join view with sources views/tables in different · b58879dd
      unknown authored
                  schemas
      The function check_one_table_access() called to check access to tables in 
      SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
      in the context of setup_tables_and_check_access().
      That's why the check_one_table() was split into two : the functionality needed by
      setup_tables_and_check_access() into check_single_table_access() and the rest of 
      the functionality stays in check_one_table_access() that is made to call the new
      check_single_table_access() function.
      
      
      mysql-test/r/view_grant.result:
        Bug #20482: failure on Create join view with sources views/tables in different 
                    schemas
        - test suite for the bug
      mysql-test/t/view_grant.test:
        Bug #20482: failure on Create join view with sources views/tables in different 
                    schemas
        - test suite for the bug
      sql/mysql_priv.h:
        Bug #20482: failure on Create join view with sources views/tables in different 
                    schemas
        - check_one_table_access split into 2
      sql/sql_base.cc:
        Bug #20482: failure on Create join view with sources views/tables in different 
                    schemas
        - the new sub-function called
      sql/sql_parse.cc:
        Bug #20482: failure on Create join view with sources views/tables in different 
                    schemas
        - check_one_table_access() split into two : check_single_table_access() to 
          actually check access to the table(ro) and check_one_table_access() that calls
          check_single_table_access() and checks also the tables belonging to sub selects
          or implicitly opened tables.
      b58879dd
  11. 20 Jun, 2006 2 commits
    • unknown's avatar
      Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored · 4415c751
      unknown authored
      function crashes server".
      
      Attempts to execute prepared multi-delete statement which involved trigger or
      stored function caused server crashes (the same happened for such statements
      included in stored procedures in cases when one tried to execute them more
      than once).
      
      The problem was caused by yet another incorrect usage of check_table_access()
      routine (the latter assumes that table list which it gets as argument
      corresponds to value LEX::query_tables_own_last). We solve this problem by
      juggling with LEX::query_tables_own_last value when we call
      check_table_access() for LEX::auxilliary_table_list (better solution is too
      intrusive and should be done in 5.1).
      
      
      mysql-test/r/sp-prelocking.result:
        Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
        stored function crashes server".
      mysql-test/t/sp-prelocking.test:
        Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
        stored function crashes server".
      sql/sql_parse.cc:
        To call safely check_table_access() for LEX::auxilliary_table_list we have
        to juggle with LEX::query_tables_own_last value.
      4415c751
    • unknown's avatar
      SHOW STATUS does not anymore change local status variables (except... · 45ea5145
      unknown authored
      SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated.
      SHOW STATUS are not anymore put in slow query log because of no index usage.
      
      Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command()
      This simplifies code and allows us to remove some if statements all over the code.
      
      Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands.
      This allowed some overall simplifaction when testing sql_command.
      
      Fixes bugs:
      Bug#10210: running SHOW STATUS increments counters it shouldn't
      Bug#19764: SHOW commands end up in the slow log as table scans
      
      
      mysql-test/r/grant_cache.result:
        Fixed results after SHOW STATUS doesn't anymore affect status variables
      mysql-test/r/information_schema.result:
        Added extra test to cover more code
      mysql-test/r/query_cache.result:
        Remove resuts from previous tests
      mysql-test/r/status.result:
        Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables.
        (Bug#10210)
      mysql-test/r/temp_table.result:
        Fixed results after SHOW STATUS doesn't anymore affect status variables
      mysql-test/r/union.result:
        Fixed results after SHOW STATUS is not logged to slow query log
        (Bug#19764)
      mysql-test/t/events_microsec.test:
        Disable warnings at init
      mysql-test/t/information_schema.test:
        Added extra test to cover more code
      mysql-test/t/query_cache.test:
        Remove resuts from previous tests
      mysql-test/t/status.test:
        Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables.
        (Bug #10210)
      sql/mysql_priv.h:
        Added 'sql_command_flags'
      sql/sql_class.cc:
        New function add_diff_to_status(), used to update global status variables when using SHOW STATUS
      sql/sql_class.h:
        New function 'fill_information_schema_tables()'
        (One could not anymore use fill_derived_tables() for this as only_view_structures() is not relevant for information schema tables)
        Added defines for bit flags in sql_command_flags[]
      sql/sql_lex.cc:
        Remove orig_sql_command
      sql/sql_lex.h:
        Remove orig_sql_command
      sql/sql_parse.cc:
        Rename uc_update_queries -> sql_command_flags.
        Enhanced 'sql_command_flags' to better classify SQL commands
        uc_update_queries[] != 0 is changed to (sql_command_flags[] & CF_CHANGES_DATA)
        lex->orig_sql_command == SQLCOM_END is changed to (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0)
        
        Simplify incrementing of thd->status_var.com_stat[] as we don't have to do special handling for SHOW commands.
        
        Split SQLCOM_SELECT handling in mysql_execute_command() to a separate function.
        Added special handling of SHOW STATUS commands in mysql_execute_command() and call common SQLCOM_SELECT handling.
        These changes allows us to easily fix that we save and restore status variables during execution of a SHOW STATUS command.
        Don't log SHOW STATUS commands to slow query log.
        
        This fixes Bug#10210 and Bug#19764 without adding additional 'if' code.
        (The new code is faster than the original as we now have fewer if's than before)
      sql/sql_prepare.cc:
        Clean up prepare-check handling of SQLCOM commands by using sql_command_flags[]
        This simplifes code and ensures that code works even if someone forgets to put a new status commands into the switch statement.
      sql/sql_select.cc:
        Remove special handling of SHOW STATUS.
        (This is now done in SQLCOM_SHOW_STATUS part in mysql_execute_command())
      sql/sql_show.cc:
        Remove orig_sql_command
        Only change sql_command during 'open_normal_and_derived_tables()' (for views) and not for the full duration of generating data.
        Changed 'show status' to use thd->initial_status_var to ensure that the current statement is not affecting the to-be-used values.
        Use thd->fill_information_schema_tables() instead of 'thd->fill_derived_tables()' as the later wrongly checks the value of sql_command.
      sql/sql_yacc.yy:
        Remove usage of orig_sql_command.
        One side effect of this is that we need to test for cursors if the current command is a SELECT or a SHOW command.
      sql/structs.h:
        Updated comment
      45ea5145
  12. 19 Jun, 2006 1 commit
    • unknown's avatar
      Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error · 4b710d89
      unknown authored
      There was an incomplete reset of the name resolution context, that caused 
      INSERT ... SELECT ... JOIN statements to resolve not by joint row type calculated
      for the join.
      Removed the redundant re-initialization of the context, because 
      mysql_insert_select_prepare() now correctly saves/restores the context.
      
      
      mysql-test/r/insert_select.result:
        Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
        
        - testsuite for the bug
      mysql-test/t/insert_select.test:
        Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
        
        - testsuite for the bug
      sql/sql_parse.cc:
        Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
        
        - remove an incomplete reset of the context because the mentioned function
        correctly saves/restores the context.
      4b710d89
  13. 12 Jun, 2006 1 commit
    • unknown's avatar
      Bug #20363: Create view on just created view is now denied · addda141
      unknown authored
      There was a wrong determination of the DB name (witch is 
      not always the one in TABLE_LIST because derived tables
      may be calculated using temp tables that have their db name
      set to "").
      The fix determines the database name according to the type 
      of table reference, and calls the function check_access() 
      with the correct db name so the correct set of grants is found.
      
      
      mysql-test/r/view_grant.result:
        testsuite for the bug
      mysql-test/t/view_grant.test:
        testsuite for the bug
      sql/sql_parse.cc:
        correct determination of the db name.
      addda141
  14. 09 Jun, 2006 1 commit
  15. 08 Jun, 2006 1 commit
    • unknown's avatar
      Reorganize, physically the events code · c911d2b9
      unknown authored
      Unify method naming -> create/update/drop_event
      Move class Event_timed to event_timed.h
      class Events is in events.h (renamed from event.h)
      The implementation is in events.cc (renamed from event.h)
      
      
      BitKeeper/deleted/.del-event_executor.cc~f4a4645b973838ab:
        Delete: sql/event_executor.cc
      include/my_time.h:
        add a boundary
      libmysqld/CMakeLists.txt:
        event.cc -> events.cc
      libmysqld/Makefile.am:
        event.cc -> event.cc
      sql/CMakeLists.txt:
        event.cc -> events.cc
      sql/Makefile.am:
        event.cc -> events.cc
        event_priv.h -> events_priv.h
      sql/event_scheduler.cc:
        event.h -> events.h
        add_event -> create_event
        replace_event -> update_event()
        event_timed_compare_q is only used in event_scheduler.cc , so moving it
        from event.cc and making it static
      sql/event_scheduler.h:
        add_event -> create_event
        replace_event -> update_event
      sql/event_timed.cc:
        moved extern interval_type_to_name to mysql_priv.h
      sql/mysql_priv.h:
        moved my_time_compare to time.cc
      sql/mysqld.cc:
        event.h -> events.h
      sql/sql_db.cc:
        event.h -> events.h
      sql/sql_parse.cc:
        event.h -> events.h
        class Event_timed moved to event_timed.h
      sql/sql_show.cc:
        event.h -> events.h
        class Event_timed moved to event_timed.h
      sql/sql_yacc.yy:
        event.h -> events.h
        class Event_timed moved to event_timed.h
      sql/events.cc:
        add_event -> create_event
        replace_event -> update_event
        event_timed_compare_q moved to event_scheduler.cc
      sql/events.h:
        class Event_timed moved to event_timed.h
      sql/events_priv.h:
        my_time_compare moved to mysql_priv.h
        event_timed_compare_q is static in event_scheduler.cc
      sql/time.cc:
        moved interval_type_to_name from event.cc to here.
      BitKeeper/etc/ignore:
        Added libmysqld/events.cc to the ignore list
      c911d2b9
  16. 06 Jun, 2006 1 commit
    • unknown's avatar
      Re-apply missing changeset, orignally pushed by elliot · 43548a56
      unknown authored
      Add define YASSL_PREFIX when compiling yassl
      
      Import patch from yaSSL
      - avoid allocating memory for each call to 'EVP_md5' and 
        'EVP_des_ede3_cbc' which were not released until server was stopped
      - Those functions are used from the SQL function 'des_encrypt' and
        'des_decrypt'.
      
      Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files
      
      Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
      - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1
      
      - Include prefix files that renames all public functions in yaSSLs
        OpenSSL API to ya<function_name>. They will otherwise conflict
        with OpenSSL functions if loaded by an application that uses OpenSSL
        as well as libmysqlclient with yaSSL support.
      
      Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
        
      Two threads both try a shutdown sequence which creates a race to the
      de-init/free of certain resources.
        
      This exists in similar form in the client as 17926: "mysql.exe crashes
      when ctrl-c is pressed in windows."
      
      Update after merge to 5.0
      
      BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
      Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.
      
      - In function 'handle_grant_struct' when searching the memory structures for an 
        entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
        with the host passed in argument "user_from".
      - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
        memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
        that "any host" can connect. Thus is's correct to turn on allow_all_hosts
        when such a user is found. 
      - Review and fix other places where host.hostname may be NULL.
      
      BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
      Removed duplication (not a user-visible change)
      
      
      client/Makefile.am:
        Remove $yassl_includes
      client/mysqltest.c:
        Turn on ssl_verify_server_cert only if host is "localhost"
      extra/yassl/include/openssl/crypto.h:
        Add prefix file for ssl.h
      extra/yassl/include/openssl/ssl.h:
        Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*
      extra/yassl/include/yassl_int.hpp:
        Import patch yassl.diff
      extra/yassl/src/Makefile.am:
        Add defined YASSL_PREFIX when building yassl/testsuite
      extra/yassl/src/ssl.cpp:
        Import patch yassl.diff
      extra/yassl/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/testsuite/Makefile.am:
        Add defined YASSL_PREFIX when building yassl/testsuite
      extra/yassl/yassl.vcproj:
        Add define YASSL_PREFIX when compiling yassl
      include/violite.h:
        Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files
      libmysql/Makefile.am:
        Remove yassl_includes
      libmysql_r/Makefile.am:
        Remove yassl_includes
      libmysqld/Makefile.am:
        Remove yassl_includes
      libmysqld/examples/Makefile.am:
        Remove yassl_includes
      mysql-test/r/analyze.result:
        Add missing drop table
      mysql-test/r/grant.result:
        Reorder test result
        Add test cases for users with hostname ""
      mysql-test/r/ps.result:
        Add missing drop table
      mysql-test/t/analyze.test:
        Add missing drop table
      mysql-test/t/grant.test:
        Add "use test"
        Add test cases for users with hostname ""
        - Test create, grant and drop as well as connecting as the user with hostname "".
      mysql-test/t/ps.test:
        Add missing drop table
      server-tools/instance-manager/Makefile.am:
        Remove yassl_includes
      sql/Makefile.am:
        Remove yassl_includes
      sql/mysqld.cc:
        We have three potential ways of hitting the iceberg:
        - unireg_end()   has basic de-init
        - unireg_abort() has extended de-init
        - main() has a de-init sequence similar to unireg_abort()
        
        In the Windows version of the server, Control-C is handled
        in a different thread from the one main() is in.  The main
        loop is told to end, then unireg_abort() is called.  Its
        de-init and that of main() will then race each other for
        mutex- and cond-var-destroys, free(), and finally exit().
        
        This patch introduces a special case for Windows that will eliminate
        the race by ending the signal-handler via unireg_end() instead if
        SIGINT is signalled.  This seems the least intrusive fix that still
        fixes user-visible behaviour.
        
        Two of the startup options for mysqld, innodb_commit_concurrency
        and innodb_thread_concurrency, were using the same enumeration
        value. Changed to give innodb_commit_concurrency it's own value.
      sql/sql_acl.cc:
        Add check if host is NULL
        Add check if grant_name->host.hostname is null
        Convert places where host.hostname is NULL to "" before using it.
      sql/sql_parse.cc:
        Calculate and display the global statistics.
      vio/Makefile.am:
        Remove yassl_includes
      extra/yassl/include/openssl/generate_prefix_files.pl:
        New BitKeeper file ``extra/yassl/include/openssl/generate_prefix_files.pl''
      extra/yassl/include/openssl/prefix_crypto.h:
        New BitKeeper file ``extra/yassl/include/openssl/prefix_crypto.h''
      extra/yassl/include/openssl/prefix_ssl.h:
        New BitKeeper file ``extra/yassl/include/openssl/prefix_ssl.h''
      43548a56
  17. 04 Jun, 2006 1 commit
    • unknown's avatar
      This changeset is largely a handler cleanup changeset (WL#3281), but includes... · 85a8e6ab
      unknown authored
      This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
      
      Changes that requires code changes in other code of other storage engines.
      (Note that all changes are very straightforward and one should find all issues
      by compiling a --debug build and fixing all compiler errors and all
      asserts in field.cc while running the test suite),
      
      - New optional handler function introduced: reset()
        This is called after every DML statement to make it easy for a handler to
        statement specific cleanups.
        (The only case it's not called is if force the file to be closed)
      
      - handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
        should be moved to handler::reset()
      
      - table->read_set contains a bitmap over all columns that are needed
        in the query.  read_row() and similar functions only needs to read these
        columns
      - table->write_set contains a bitmap over all columns that will be updated
        in the query. write_row() and update_row() only needs to update these
        columns.
        The above bitmaps should now be up to date in all context
        (including ALTER TABLE, filesort()).
      
        The handler is informed of any changes to the bitmap after
        fix_fields() by calling the virtual function
        handler::column_bitmaps_signal(). If the handler does caching of
        these bitmaps (instead of using table->read_set, table->write_set),
        it should redo the caching in this code. as the signal() may be sent
        several times, it's probably best to set a variable in the signal
        and redo the caching on read_row() / write_row() if the variable was
        set.
      
      - Removed the read_set and write_set bitmap objects from the handler class
      
      - Removed all column bit handling functions from the handler class.
        (Now one instead uses the normal bitmap functions in my_bitmap.c instead
        of handler dedicated bitmap functions)
      
      - field->query_id is removed. One should instead instead check
        table->read_set and table->write_set if a field is used in the query.
      
      - handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
        handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
        instead use table->read_set to check for which columns to retrieve.
      
      - If a handler needs to call Field->val() or Field->store() on columns
        that are not used in the query, one should install a temporary
        all-columns-used map while doing so. For this, we provide the following
        functions:
      
        my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
        field->val();
        dbug_tmp_restore_column_map(table->read_set, old_map);
      
        and similar for the write map:
      
        my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
        field->val();
        dbug_tmp_restore_column_map(table->write_set, old_map);
      
        If this is not done, you will sooner or later hit a DBUG_ASSERT
        in the field store() / val() functions.
        (For not DBUG binaries, the dbug_tmp_restore_column_map() and
        dbug_tmp_restore_column_map() are inline dummy functions and should
        be optimized away be the compiler).
      
      - If one needs to temporary set the column map for all binaries (and not
        just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
        methods) one should use the functions tmp_use_all_columns() and
        tmp_restore_column_map() instead of the above dbug_ variants.
      
      - All 'status' fields in the handler base class (like records,
        data_file_length etc) are now stored in a 'stats' struct. This makes
        it easier to know what status variables are provided by the base
        handler.  This requires some trivial variable names in the extra()
        function.
      
      - New virtual function handler::records().  This is called to optimize
        COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
        (stats.records is not supposed to be an exact value. It's only has to
        be 'reasonable enough' for the optimizer to be able to choose a good
        optimization path).
      
      - Non virtual handler::init() function added for caching of virtual
        constants from engine.
      
      - Removed has_transactions() virtual method. Now one should instead return
        HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
        transactions.
      
      - The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
        that is to be used with 'new handler_name()' to allocate the handler
        in the right area.  The xxxx_create_handler() function is also
        responsible for any initialization of the object before returning.
      
        For example, one should change:
      
        static handler *myisam_create_handler(TABLE_SHARE *table)
        {
          return new ha_myisam(table);
        }
      
        ->
      
        static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
        {
          return new (mem_root) ha_myisam(table);
        }
      
      - New optional virtual function: use_hidden_primary_key().
        This is called in case of an update/delete when
        (table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
        but we don't have a primary key. This allows the handler to take precisions
        in remembering any hidden primary key to able to update/delete any
        found row. The default handler marks all columns to be read.
      
      - handler::table_flags() now returns a ulonglong (to allow for more flags).
      
      - New/changed table_flags()
        - HA_HAS_RECORDS	    Set if ::records() is supported
        - HA_NO_TRANSACTIONS	    Set if engine doesn't support transactions
        - HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
                                  Set if we should mark all primary key columns for
      			    read when reading rows as part of a DELETE
      			    statement. If there is no primary key,
      			    all columns are marked for read.
        - HA_PARTIAL_COLUMN_READ  Set if engine will not read all columns in some
      			    cases (based on table->read_set)
       - HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
         			    Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
       - HA_DUPP_POS              Renamed to HA_DUPLICATE_POS
       - HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
      			    Set this if we should mark ALL key columns for
      			    read when when reading rows as part of a DELETE
      			    statement. In case of an update we will mark
      			    all keys for read for which key part changed
      			    value.
        - HA_STATS_RECORDS_IS_EXACT
      			     Set this if stats.records is exact.
      			     (This saves us some extra records() calls
      			     when optimizing COUNT(*))
      			    
      
      - Removed table_flags()
        - HA_NOT_EXACT_COUNT     Now one should instead use HA_HAS_RECORDS if
      			   handler::records() gives an exact count() and
      			   HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
        - HA_READ_RND_SAME	   Removed (no one supported this one)
      
      - Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
      
      - Renamed handler::dupp_pos to handler::dup_pos
      
      - Removed not used variable handler::sortkey
      
      
      Upper level handler changes:
      
      - ha_reset() now does some overall checks and calls ::reset()
      - ha_table_flags() added. This is a cached version of table_flags(). The
        cache is updated on engine creation time and updated on open.
      
      
      MySQL level changes (not obvious from the above):
      
      - DBUG_ASSERT() added to check that column usage matches what is set
        in the column usage bit maps. (This found a LOT of bugs in current
        column marking code).
      
      - In 5.1 before, all used columns was marked in read_set and only updated
        columns was marked in write_set. Now we only mark columns for which we
        need a value in read_set.
      
      - Column bitmaps are created in open_binary_frm() and open_table_from_share().
        (Before this was in table.cc)
      
      - handler::table_flags() calls are replaced with handler::ha_table_flags()
      
      - For calling field->val() you must have the corresponding bit set in
        table->read_set. For calling field->store() you must have the
        corresponding bit set in table->write_set. (There are asserts in
        all store()/val() functions to catch wrong usage)
      
      - thd->set_query_id is renamed to thd->mark_used_columns and instead
        of setting this to an integer value, this has now the values:
        MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
        Changed also all variables named 'set_query_id' to mark_used_columns.
      
      - In filesort() we now inform the handler of exactly which columns are needed
        doing the sort and choosing the rows.
      
      - The TABLE_SHARE object has a 'all_set' column bitmap one can use
        when one needs a column bitmap with all columns set.
        (This is used for table->use_all_columns() and other places)
      
      - The TABLE object has 3 column bitmaps:
        - def_read_set     Default bitmap for columns to be read
        - def_write_set    Default bitmap for columns to be written
        - tmp_set          Can be used as a temporary bitmap when needed.
        The table object has also two pointer to bitmaps read_set and write_set
        that the handler should use to find out which columns are used in which way.
      
      - count() optimization now calls handler::records() instead of using
        handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
      
      - Added extra argument to Item::walk() to indicate if we should also
        traverse sub queries.
      
      - Added TABLE parameter to cp_buffer_from_ref()
      
      - Don't close tables created with CREATE ... SELECT but keep them in
        the table cache. (Faster usage of newly created tables).
      
      
      New interfaces:
      
      - table->clear_column_bitmaps() to initialize the bitmaps for tables
        at start of new statements.
      
      - table->column_bitmaps_set() to set up new column bitmaps and signal
        the handler about this.
      
      - table->column_bitmaps_set_no_signal() for some few cases where we need
        to setup new column bitmaps but don't signal the handler (as the handler
        has already been signaled about these before). Used for the momement
        only in opt_range.cc when doing ROR scans.
      
      - table->use_all_columns() to install a bitmap where all columns are marked
        as use in the read and the write set.
      
      - table->default_column_bitmaps() to install the normal read and write
        column bitmaps, but not signaling the handler about this.
        This is mainly used when creating TABLE instances.
      
      - table->mark_columns_needed_for_delete(),
        table->mark_columns_needed_for_delete() and
        table->mark_columns_needed_for_insert() to allow us to put additional
        columns in column usage maps if handler so requires.
        (The handler indicates what it neads in handler->table_flags())
      
      - table->prepare_for_position() to allow us to tell handler that it
        needs to read primary key parts to be able to store them in
        future table->position() calls.
        (This replaces the table->file->ha_retrieve_all_pk function)
      
      - table->mark_auto_increment_column() to tell handler are going to update
        columns part of any auto_increment key.
      
      - table->mark_columns_used_by_index() to mark all columns that is part of
        an index.  It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
        it to quickly know that it only needs to read colums that are part
        of the key.  (The handler can also use the column map for detecting this,
        but simpler/faster handler can just monitor the extra() call).
      
      - table->mark_columns_used_by_index_no_reset() to in addition to other columns,
        also mark all columns that is used by the given key.
      
      - table->restore_column_maps_after_mark_index() to restore to default
        column maps after a call to table->mark_columns_used_by_index().
      
      - New item function register_field_in_read_map(), for marking used columns
        in table->read_map. Used by filesort() to mark all used columns
      
      - Maintain in TABLE->merge_keys set of all keys that are used in query.
        (Simplices some optimization loops)
      
      - Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
        but the field in the clustered key is not assumed to be part of all index.
        (used in opt_range.cc for faster loops)
      
      -  dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
         tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
         mark all columns as usable.  The 'dbug_' version is primarily intended
         inside a handler when it wants to just call Field:store() & Field::val()
         functions, but don't need the column maps set for any other usage.
         (ie:: bitmap_is_set() is never called)
      
      - We can't use compare_records() to skip updates for handlers that returns
        a partial column set and the read_set doesn't cover all columns in the
        write set. The reason for this is that if we have a column marked only for
        write we can't in the MySQL level know if the value changed or not.
        The reason this worked before was that MySQL marked all to be written
        columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
        bug'.
      
      - open_table_from_share() does not anymore setup temporary MEM_ROOT
        object as a thread specific variable for the handler. Instead we
        send the to-be-used MEMROOT to get_new_handler().
        (Simpler, faster code)
      
      
      
      Bugs fixed:
      
      - Column marking was not done correctly in a lot of cases.
        (ALTER TABLE, when using triggers, auto_increment fields etc)
        (Could potentially result in wrong values inserted in table handlers
        relying on that the old column maps or field->set_query_id was correct)
        Especially when it comes to triggers, there may be cases where the
        old code would cause lost/wrong values for NDB and/or InnoDB tables.
      
      - Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
        OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
        This allowed me to remove some wrong warnings about:
        "Some non-transactional changed tables couldn't be rolled back"
      
      - Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
        (thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
        some warnings about
        "Some non-transactional changed tables couldn't be rolled back")
      
      - Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
        which could cause delete_table to report random failures.
      
      - Fixed core dumps for some tests when running with --debug
      
      - Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
        (This has probably caused us to not properly remove temporary files after
        crash)
      
      - slow_logs was not properly initialized, which could maybe cause
        extra/lost entries in slow log.
      
      - If we get an duplicate row on insert, change column map to read and
        write all columns while retrying the operation. This is required by
        the definition of REPLACE and also ensures that fields that are only
        part of UPDATE are properly handled.  This fixed a bug in NDB and
        REPLACE where REPLACE wrongly copied some column values from the replaced
        row.
      
      - For table handler that doesn't support NULL in keys, we would give an error
        when creating a primary key with NULL fields, even after the fields has been
        automaticly converted to NOT NULL.
      
      - Creating a primary key on a SPATIAL key, would fail if field was not
        declared as NOT NULL.
      
      
      Cleanups:
      
      - Removed not used condition argument to setup_tables
      
      - Removed not needed item function reset_query_id_processor().
      
      - Field->add_index is removed. Now this is instead maintained in
        (field->flags & FIELD_IN_ADD_INDEX)
      
      - Field->fieldnr is removed (use field->field_index instead)
      
      - New argument to filesort() to indicate that it should return a set of
        row pointers (not used columns). This allowed me to remove some references
        to sql_command in filesort and should also enable us to return column
        results in some cases where we couldn't before.
      
      - Changed column bitmap handling in opt_range.cc to be aligned with TABLE
        bitmap, which allowed me to use bitmap functions instead of looping over
        all fields to create some needed bitmaps. (Faster and smaller code)
      
      - Broke up found too long lines
      
      - Moved some variable declaration at start of function for better code
        readability.
      
      - Removed some not used arguments from functions.
        (setup_fields(), mysql_prepare_insert_check_table())
      
      - setup_fields() now takes an enum instead of an int for marking columns
         usage.
      
      - For internal temporary tables, use handler::write_row(),
        handler::delete_row() and handler::update_row() instead of
        handler::ha_xxxx() for faster execution.
      
      - Changed some constants to enum's and define's.
      
      - Using separate column read and write sets allows for easier checking
        of timestamp field was set by statement.
      
      - Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
      
      - Don't build table->normalized_path as this is now identical to table->path
        (after bar's fixes to convert filenames)
      
      - Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
        do comparision with the 'convert-dbug-for-diff' tool.
      
      
      Things left to do in 5.1:
      
      - We wrongly log failed CREATE TABLE ... SELECT in some cases when using
        row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
        Mats has promised to look into this.
      
      - Test that my fix for CREATE TABLE ... SELECT is indeed correct.
        (I added several test cases for this, but in this case it's better that
        someone else also tests this throughly).
        Lars has promosed to do this.
      
      
      BitKeeper/etc/ignore:
        added mysys/test_bitmap
      include/base64.h:
        Removed my_global.h, as this must be included first in any program
      include/heap.h:
        Added heap_reset() (Required by new handler interface)
      include/my_base.h:
        Removed HA_EXTRA_RESET. MySQL will now call ::reset() instead of ::extra(HA_EXTRA_RESET).
        HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIVE_PRIMARY key are deleted as the column bitmaps makes these unnecessary
      include/my_bitmap.h:
        Remove my_pthread.h (should be included at upper level)
        Introduced my_bitmap_map typedef to make it the bitmap handling more like a black box
        Added bitmap_is_overlapping(), bitmap_test_and_clear(), bitmap_copy() and bitmap_cmp()
        Made bitmap_set_bit(), bitmap_flip_bit(), bitmap_clear_bit() return void
      include/myisam.h:
        Added mi_reset() (Required by new handler interface)
      include/myisammrg.h:
        Added myrg_reset() (Required by new handler interface)
      include/mysql_com.h:
        Added flag FIELD_IN_ADD_INDEX to be able to remove Field->add_index
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Added testing of CREATE ... SELECT in a mixed environment
        (This found some bugs that Mats is going to fix shortly)
      mysql-test/install_test_db.sh:
        Simplify ldata usage
        Added --tmpdir=. option to mysqld bootstrap (Removed some warnings when TMPDIR was wrongly set)
      mysql-test/mysql-test-run.pl:
        Added --tmpdir=. to bootstrap
      mysql-test/mysql-test-run.sh:
        Use copy instead of INSTALL_DB for master and slave databases.
        (Speeds up startup time a lot!)
        Remove snapshot directories at startup (removes some strange warnings)
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Added testing of CREATE ... SELECT in a mixed environment
        (This found some bugs that Mats is going to fix shortly)
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Added testing of CREATE ... SELECT in a mixed environment
      mysql-test/r/create.result:
        Some extra tests of warnings and number of tables opened by CREATE ... SELECT
      mysql-test/r/federated.result:
        Drop some left over tables
        Added testing of multiple table update and multiple table delete (with and without keys)
      mysql-test/r/func_gconcat.result:
        Enable some disabled tests (converted them slightly to be predictable)
      mysql-test/r/func_time.result:
        Added drop of test function
      mysql-test/r/innodb_mysql.result:
        Added tests for CREATE ... SELECT
      mysql-test/r/insert.result:
        More tests
        Added testing of duplicate columns in insert
      mysql-test/r/loaddata.result:
        Added testing LOAD DATA ... SET ...
      mysql-test/r/multi_update.result:
        Test multi updates and deletes using primary key and without
      mysql-test/r/ndb_index_unique.result:
        Better error message
      mysql-test/r/ndb_replace.result:
        New correct result after fixing REPLACE handling with NDB
      mysql-test/r/rpl_ddl.result:
        Now we don't get these (wrong) warnings anymore
      mysql-test/r/view_grant.result:
        Drop used views
      mysql-test/t/create.test:
        Some extra tests of warnings and number of tables opened by CREATE ... SELECT
      mysql-test/t/federated.test:
        Drop some left over tables
        Added testing of multiple table update and multiple table delete (with and without keys)
      mysql-test/t/func_gconcat.test:
        Enable some disabled tests (converted them slightly to be predictable)
      mysql-test/t/func_time.test:
        Added drop of test function
      mysql-test/t/innodb_mysql.test:
        Added tests for CREATE ... SELECT
      mysql-test/t/insert.test:
        More tests
        Added testing of duplicate columns in insert
      mysql-test/t/loaddata.test:
        Added testing LOAD DATA ... SET ...
      mysql-test/t/multi_update.test:
        Test multi updates and deletes using primary key and without
      mysql-test/t/view_grant.test:
        Drop used views
      mysql-test/valgrind.supp:
        Added supression of not needed warnings when printing stack trace
      mysys/base64.c:
        Include my_global.h first
      mysys/my_bitmap.c:
        Added bitmap_is_overlapping(), bitmap_test_and_clear() and bitmap_copy()
        Changed logic of bitmap handling to be a bit more efficent (Did this together with Mikael Ronström)
        Now the 'extra, not used bits' in the bitmap are assumed to have a 'random value' and the bitmap functions are free to change them whenever needed.
        Changed how mutex is allocated to make 'bitmap_free()' function simpler.
      mysys/thr_lock.c:
        Added 0x before thread pointers (for easier comparison of DBUG traces)
      sql/event.cc:
        Ensure 'use_all_columns()' is used for event tables
        Don't print warning that event table is damaged if it doesn't exists.
      sql/field.cc:
        Added ASSERT_COLUMN_MARKED_FOR_WRITE in all store() methods and ASSERT_COLUMN_MARKED_FOR_READ in all val() methods to catch wrong setting if table->read_set and table->write_set
        (Rest of changes are only indentation cleanups)
      sql/field.h:
        Removed Field->query_id (replaced by table->read_set and table->write_set)
        Removed Field->fieldnr (use Field->field_index instead)
        Removed Field->add_index (Use Field->flags instead)
        Add Field->part_of_key_not_clustered (for usage in opt_range.cc)
      sql/filesort.cc:
        Added paramater sort_postion to filesort() to force sorting by position instead of storing all fields in the result set.
        This allowed me to remove checking of sql_command.
        Create a temporary column bitmap for fields that are used by the sorting process.
        Use column bitmaps instead of query_id
      sql/ha_berkeley.cc:
        Update to 'newer' table handler interface
      sql/ha_berkeley.h:
        Update to 'newer' table handler interface
      sql/ha_federated.cc:
        Update to 'newer' table handler interface
        Only read columns that are needed from remote server.
        In case of eq ranges, don't generate two conditions in the WHERE clause
        (this can still be optimized, but would require a bigger code change)
        Use 'simpler to use' XXXX_LEN' macros
        A bit simpler logic in ::write_row() when creating statements.
        In update, only include test of fields actually read.
        (This greatly simplifies the queries sent by the federated engine)
        Similar changes done for delete_row()
      sql/ha_federated.h:
        Update to 'newer' table handler interface
        Changed XXX_LEN macros to use sizeof(...)-1, to simplify usage in ha_federated.cc
        Added HA_PRIMARY_KEY_REQUIRED_FOR_DELETE to tell MySQL to read all primary key columns in case of DELETE
      sql/ha_heap.cc:
        Update to 'newer' table handler interface
      sql/ha_heap.h:
        Update to 'newer' table handler interface
      sql/ha_innodb.cc:
        Update to 'newer' table handler interface
        - Update innobase_create_handler() to new interface
        - Removed HA_NOT_EXACT_COUNT (not needed)
        - Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
        - Prefixed base status variables with 'stats'
        - Use table column bitmaps instead of ha_get_bit_in_read_set()
        - Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
        - Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
          the table->read_set and table->write_set bitmaps now are accurate
      sql/ha_innodb.h:
        Update to 'newer' table handler interface
        - table_flags are now ulonglong
        - Added reset() method
        - Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk() columns.
        - Made build_template() a class function to be able to easier access class variables
      sql/ha_myisam.cc:
        Update to 'newer' table handler interface
      sql/ha_myisam.h:
        Update to 'newer' table handler interface
      sql/ha_myisammrg.cc:
        Update to 'newer' table handler interface
      sql/ha_myisammrg.h:
        Update to 'newer' table handler interface
      sql/ha_ndbcluster.cc:
        Update to 'newer' table handler interface
        Fixed use_blob_value() to be accurate
        In ::complemented_read() we have to check both the read and write bitmap as the old code did mark all changed columns also in the read map
        Correct dumping of field data with DBUG_DUMP
        Prefix addresses in DBUG_PRINT with 0x
        Fixed usage of not initialized memory
        Update to use field->flags & FIELD_IN_ADD_INDEX instead of field->add_index.
      sql/ha_ndbcluster.h:
        Update to 'newer' table handler interface
      sql/ha_ndbcluster_binlog.cc:
        Mark usage of all columns in ndbcluster binlog tables
        false -> FALSE, true -> TRUE
        Use table->s->all_set instead of creating a temporary bitmap.
      sql/ha_partition.cc:
        Update to 'newer' table handler interface
        Added memroot to initialise_partitions() and related functions to get faster memory allocation.
        partition_create_handler() is now responsible for initialisation of the partition object
        Some trivial optimizations and indentation fixes
        Ensure that table_flags() are up to date
        Removed documentation for removed HA_EXTRA flags
        Fixed 'strange' usage of m_file[i] in new_handlers_from_part_info()that worked in current code 'by chance'
      sql/ha_partition.h:
        Update to 'newer' table handler interface
      sql/handler.cc:
        create_xxx handler now takes MEMROOT as an argument to simplify memory allocation.
        Much simpler get_new_handler()
        (Initialization of the object is now handled by the create method for the engine)
        Moved all allocation of bitmap handling to the TABLE object (in table.cc)
        Added column_bitmaps_signal() to signal column usage changes.
        Changed binlog_log_row() to use the exiusting all_set bitmap in the table object.
        Added ha_reset() function to test that the file object is ok at end of statement and call handler::reset()
        Added use_hidden_primary_key() to signal handler that we we are going to read and update + delete the row and the handler should thus remember the position for the row
      sql/handler.h:
        Added HA_NO_TRANSACTIONS, HA_PARTIAL_COLUMN_READ, HA_REQUIRES_KEY_COLUMNS_FOR_DELETE,HA_PRIMARY_KEY_REQUIRED_FOR_DELETE and HA_HAS_RECORDS
        Removed HA_NOT_EXACT_COUNT, HA_READ_RND_SAME
        HA_DUPP_POS -> HA_DUPLICATE_POS
        HA_NOT_EXACT_COUNT replaced by HA_STATS_RECORDS_IS_EXACT, HA_HAS_RECORDS and records()
        HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
        Added future row type 'ROW_TYPE_PAGES'
        Added MEM_ROOT to handlerton 'create' function
        Added ha_statistics, a structure for all status variable in the base handler class.
        Moved all status variables in the handler class into a stats structs to improve readability.
        ha_table_flags() is now a cached (not virtual) version of table_flags()
        reset() doesn't anymore call extra(HA_EXTRA_RESET) but is a function of it's own.
        Renamed dupp_ref to dup_ref
        Renamed not used handler::sortkey
        Moved read_set and write_set to TABLE structure
        handler::init() function added for cacheing of virtual constants from engine.
      sql/item.cc:
        Added register_field_in_read_map() for marking used columns in expression.
        This is used by filesort() for creating an optimal column bitmap while retrieving columns for sorting.
        Initalize value.cs_info.character_set_client to fix core dump bug with --debug
        set_query_id -> mark_used_columns
        Mark used columns in read_set OR write_set.
      sql/item.h:
        Removed reset_query_id_processor() as it's not needed anymore.
        Added register_field_in_read_map()
        Added extra argument to Item::walk() to indicate if we should also
        traverse sub queries.
      sql/item_cmpfunc.cc:
        Temporary mark used columns to be read/writable
        Update Item::walk to new interface
      sql/item_cmpfunc.h:
        Added extra argument to Item::walk() to indicate if we should also traverse sub queries.
      sql/item_func.cc:
        Update Item::walk() to new interface
        table_flags() -> ha_table_flags()
      sql/item_func.h:
        Update Item::walk() to new interface
      sql/item_row.cc:
        Update Item::walk() to new interface
      sql/item_row.h:
        Update Item::walk() to new interface
      sql/item_strfunc.h:
        Update Item::walk() to new interface
      sql/item_subselect.cc:
        Added Item_subselect::walk()
        (It was a bug it was missing before. Not sure what kind of bugs this could have caused)
      sql/item_subselect.h:
        Update Item::walk() to new interface
      sql/item_sum.cc:
        Update Item::walk() to new interface
        Updates for new handler interace
      sql/item_sum.h:
        Update Item::walk() to new interface
      sql/key.cc:
        Updates for new handler interace
      sql/log.cc:
        Mark all columns used for log tables
        Split options flag
        Ensured that second argument to trans_register_ha is a bool
      sql/log_event.cc:
        Fixed comments to be withing 79 characters
        Use OPTION_KEEP_LOG instead of OPTION_STATUS_NO_TRANS_UPDATE to remove wrong warnings
        Updates for new handler interface
        Use 0x%lx instead of %p (portability problem)
      sql/mysql_priv.h:
        Added OPTION_KEEP_LOG to indicate that we should replicate the binlog even on rollback
        Removed not used 'conds' argument to setup_tables
      sql/mysqld.cc:
        Indentation fixes and removed old comment
      sql/opt_range.cc:
        Update to new handler and bitmap interface.
        Fixed calls to cp_buffer_from_ref() and walk() (new argument).
        Create new temporary bitmaps for ror scans.
        (Needed because of handler changes and to get more accurate column bitmaps than before)
        Remove not needed file->ha_reset() call before file->close().
        Some trivial optimization and indentation fixes.
        Use Field->part_of_key_not_clustered() to check if field is part of a key, instead of looping over all key parts.
        
        Added flag 'in_ror_merged_scan' to allow ::get_next() to know that we need a special column bitmap to only fetch pointer to record.
        This is needed because ror scan uses the same TABLE object but different file objects, which creates problem for the column bitmap handling.
        (This is a temporary solution. A better one would be to allocate an own TABLE object for ROR scans)
        
        Optimized bitmap handling in ror scans:
        - Start bitmap at position 0, not 1
        - Use same bitmap size as in TABLE
        - Use table->read_set and table->write_set to create column bitmaps instead of looping over all fields in table
      sql/opt_range.h:
        Added 'in_ror_merged_scan' to indicate if we are doing a ROR scan
        Added temporary column bitmaps used in ROR scans
      sql/opt_sum.cc:
        Added get_ext_record_count() which is used in COUNT() optimization if handler has HA_HAS_RECORDS
        Note that we don't call this if handler has HA_STATS_RECORDS_IS_EXACT set.
      sql/protocol.cc:
        We need to mark columns as readable in ::store() as we sometimes return default value for fields to the user
      sql/records.cc:
        Updates for new handler interface
      sql/set_var.cc:
        Handle splitting OPTION_STATUS_NO_TRANS_UPDATE to two flags
      sql/share/errmsg.txt:
        Fixed wrong
      sql/sp.cc:
        Mark that we are using all columns for the proc table
        Update call to setup_tables() to use new prototype
      sql/sp_head.cc:
        Removed QQ comment
      sql/spatial.cc:
        Removed wrong QQ comment
      sql/sql_acl.cc:
        Mark that we need all columns for acl tables
        Supply memroot to some 'new' calls.
        Indentation fixes
      sql/sql_base.cc:
        set_query_id removed
        Ensure we call ha_reset() at end of each statement
        Mark read columns in read_set and changed columns in write_set (Before all columns was marked in read set)
        Fixed marking of some columns that was not proplerly marked before
        Maintain in TABLE->merge_keys set of all keys that are used in some way
        Removed not used 'conds' argument from setup_tables()
        Remove not used setting of 'dupp_field' in insert_fields()
        Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
        (This has probably caused us to not properly remove temporary files after crash)
      sql/sql_bitmap.h:
        Added is_overlapping()
      sql/sql_class.cc:
        Slow_logs was not properly initialized, which could maybe cause extra/lost entries in slow log.
        set_query_id -> mark_used_columns
        Simpler variable usage in pack_row()  (cleanup)
        Moved some variable declartion at start of function for better code readability
      sql/sql_class.h:
        Added enum_mark_columns
        Updated comments
        Renamed dupp_field -> dup_field
        Added virtual function 'can_rollback_data()' to select_insert() to be used in CREATE ... SELECT to optimize use of OPTION_STATUS_NO_TRANS_UPDATE.
        (This fixes a bug in CREATE ... SELECT where we did give wrong warnings when using non transacational tables)
      sql/sql_delete.cc:
        Updates to new handler interface
        Call table->mark_columns_needed_for_delete() to allow us to put additional columns in column usage maps if handler so requires.
        Call table->prepare_for_position() to tell handler that we are going to call ha_position().
        Removed call to free_io_cache(). (io_cache is now removed in ha_reset()).
        Fixed calls to setup_tables()
      sql/sql_do.cc:
        Update call to setup_fields()
      sql/sql_handler.cc:
        Tell handler tables to always read all columns.
        Use temporary column map when storing value in field for later index usage
      sql/sql_help.cc:
        Makr all used fields to be read
        Update call to setup_fields()
      sql/sql_insert.cc:
        Tell handler we are going to update the auto_increment column
        dupp_field -> dup_field
        Set column usage bits for timestamp field.
        Call table->mark_columns_needed_for_insert() and table->mark_auto_increment_column()
        Removed not used argument from mysql_prepare_insert_check_table().
        
        If we get an duplicate row on insert, change column map to read and write all columns while retrying the operatation.
        This is required by the definition of REPLACE and also ensures that fields that are only part of UPDATE are properly handled.
        This fixed a bug in NDB and REPLACE where REPLACE wrongly copied some column values from the replaced row.
        
        Setup new bitmaps for delayed insert rows
        Remove reseting of next_number_fields as it will be reset on next call to handler_insert()
        
        Fixed usage of thd->options and OPTION_STATUS_NO_TRANS_UPDATE.
        The issue was that one should not to reset this flag as it may be set by a previous statement.
        The way it was now used caused us to loose some warnings and get other wrong warnings when using non transactional tables mixed with transactional.
        I fixed it by introducing 'select_insert::can_rollback_data' to inform send_error() that the given statement can be rolled back (which in case of CREATE TABLE can always be done)
        Don't close tables created with CREATE ... SELECT but keep them in the table cache.
        
        Moved out MY_HOOKS from inside function (better readability)
      sql/sql_load.cc:
        Update to use new handler and column marking interface
        Update using setup_tables()
      sql/sql_olap.cc:
        Update calls to setup_tables
        Use enums instead of constants to setup_fields()
      sql/sql_parse.cc:
        Handle OPTION_KEEP_LOG:
        - Set it on CREATE TEMPORARY TABLE / DROP TABLE
        - Reset it when OPTION_STATUS_NO_TRANS_UPDATE is reset
        - Don't set it for CREATE ... SELECT (this is handled in select_create class)
        Remove reseting of OPTION_STATUS_NO_TRANS_UPDATE in begin_trans() as this should already be reset.
        If in autocommit mode, reset OPTION_KEEP_LOG and OPTION_STATUS_NO_TRANS_UPDATE to not give warnings in future commands
      sql/sql_partition.cc:
        Update walk() usage
        Trivial indentation fixes
      sql/sql_plugin.cc:
        Mark all columns as used for plugins
      sql/sql_prepare.cc:
        Added assert to find out hidden bugs in character_set_client (got an error in debug binary when this not set correctly)
        Updates for new handler interface
        Update calls to setup_fields()
      sql/sql_repl.cc:
        Indentation fixes
      sql/sql_select.cc:
        Update call to setup_tables() and setup_fields()
        Remove some old disabled code
        Update to new hadler interface
        Indentation cleanups
        Added column bitmaps for temporary tables.
        Remove updating of the removed slots in the Field class
        Added TABLE argument to cp_buffer_from_ref() (To be able to install temporary column maps)
        For internal temporary tables, use handler::write_row(), handler::delete_row() and handler::update_row() instead of handler::ha_xxxx() for faster execution.
      sql/sql_select.h:
        Indentaition fixes.
        Install temporary column usage maps when needed
        Added TABLE element to cp_buffer_from_ref()
      sql/sql_show.cc:
        Update to new handler interface
        Mark all columns used for internal tables.
        Style fixes.
        Added support for 'future' ROW_TYPE_PAGES.
        Don't allocate TMP_TABLE_PARAM with calloc. The 'init()' function will initialize the structure properly.
      sql/sql_table.cc:
        Update to new handler interface
        Simple my_snprintf -> strmake()
        Changed some constants to defines
        Don't test for NULL in primary key (as we a couple of line above force the PRIMARY KEY to be NOT NULL)
        Change field->add_index to use field->flags & FIELD_IN_ADD_INDEX
        Mark all columns as used for ALTER TABLE
        Style fixes
        Update call to filesort()
      sql/sql_trigger.h:
        Added friend functions to be able to test if triggers exists for table we are going to insert/update or delete in.
      sql/sql_udf.cc:
        Mark all columns as used for udf system table.
      sql/sql_union.cc:
        Update call to walk()
        Update to new handler interface
      sql/sql_update.cc:
        Remove query_id argument from compare_record()
        Use column bitmaps instead of query_id.
        We can't use compare_records() to skip updates for handlers that returns a partial column set and the read_set doesn't cover all columns in the write set, because compare_record() can't in this case know if a not read column changed value.
        Update call to setup_fields()
        Using separate column read and write sets allows for easier checking of timestamp field was set by statement.
        Removed call to free_io_cache() as this is now done in ha_reset()
        Call table->mark_columns_needed_for_update() and table->prepare_for_position()
        Style fixes
      sql/sql_view.cc:
        Style fixes
      sql/table.cc:
        Remove implicitely include 'errno.h'
        Remove code for building normalized path, as this is now identical to 'path'
        Remove field->fieldnr
        Added update of field->part_of_key_not_clustered()
        Create column bitmaps in TABLE and TABLE_SHARE
        Don't setup a temporary MEM_ROOT object as a thread specific variable for the handler. Instead we send the to-be-used MEMROOT to get_new_handler()
        Update to new handler interface
        Update call to walk()
        Added new functions:
        - st_table::clear_column_bitmaps()
        - st_table::prepare_for_position()
        - st_table::mark_columns_used_by_index()
        - st_table::restore_column_maps_after_mark_index()
        - st_table::mark_columns_used_by_index_no_reset()
        - st_table::mark_auto_increment_column()
        - st_table::mark_columns_needed_for_delete()
        - st_table::mark_columns_needed_for_update()
        - st_table::mark_columns_needed_for_insert()
      sql/table.h:
        Moved column usage bitmaps from handler to TABLE
        Added to TABLE_SHARE all_set and column_bitmap_size
        Added to TABLE merge_keys, bitmap_init_values, def_read_set, def_write_set, tmp_set, read_set and write_set.
        Declared all new table column bitmap functions
        Added TABLE functions column_bitmaps_set(), column_bitmaps_set_no_signal(), use_all_columns() and default_column_bitmaps()
        Added functions: tmp_use_all_columns() and tmp_restore_column_map() to temporarly switch column bitmaps
        Added functions: dbug_tmp_use_all_columns() and dbug_tmp_restore_column_map() to temporarly switch column bitmaps to avoid asserts in Field::store() and Field::val().
      sql/tztime.cc:
        Mark all columns as used for timezone tables
      storage/archive/ha_archive.cc:
        Update to new handler interface
      storage/archive/ha_archive.h:
        Update to new handler interface
      storage/blackhole/ha_blackhole.cc:
        Update to new handler interface
      storage/blackhole/ha_blackhole.h:
        Update to new handler interface
        removed not needed flag HA_DUPP_POS
      storage/csv/ha_tina.cc:
        Update to new handler interface
      storage/csv/ha_tina.h:
        Update to new handler interface
      storage/example/ha_example.cc:
        Update to new handler interface
      storage/example/ha_example.h:
        Update to new handler interface
      storage/heap/hp_extra.c:
        Added heap_reset() (Required by new handler interface)
      storage/heap/hp_test2.c:
        Use heap_reset()
      storage/myisam/ft_boolean_search.c:
        Fixed compiler warning
      storage/myisam/mi_extra.c:
        Added mi_reset() (Required by new handler interface)
      storage/myisam/mi_search.c:
        Fixed DBUG_PRINT messages to use 0x%lx instead of %lx
      storage/myisam/mi_test2.c:
        Use mi_reset()
      storage/myisam/myisampack.c:
        Use mi_reset()
      storage/myisammrg/myrg_extra.c:
        Added myrg_reset() (Required by new handler interface)
      unittest/mysys/base64.t.c:
        Include my_global.h
        Don't include implictely include file 'stdlib.h'
      85a8e6ab
  18. 29 May, 2006 1 commit
    • unknown's avatar
      Fix for bug #17394 - Events namespace is wrong · c7d7c47d
      unknown authored
      mysql-test/lib/init_db.sql:
        remove definer from PK
      mysql-test/r/events.result:
        update results
      mysql-test/r/system_mysql_db.result:
        update results
      mysql-test/t/events.test:
        remove I_S.EVENTS test and move it to events_grant.test
      scripts/mysql_fix_privilege_tables.sql:
        change table definition
      sql/event.cc:
        make events non-user specific (namespace change)
      sql/event.h:
        make events non-user specific (namespace change)
      sql/event_priv.h:
        make events non-user specific (namespace change)
      sql/event_scheduler.cc:
        make events non-user specific (namespace change)
      sql/event_timed.cc:
        make events non-user specific (namespace change)
      sql/sql_parse.cc:
        make events non-user specific (namespace change)
      sql/sql_show.cc:
        SHOW EVENTS is available to everyone who has EVENT on specific schema.
        No additional privileges are needed to see others' events.
        - user A has events in db1 and db2
        - user B has events in db1 and db3
        A will see all his events from db1 and db2 as well as B's events
        from db1 but not from db3.
        B will see her events from db1 and db3. In addition B will see
        only A's events from db1 but not db2.
      c7d7c47d
  19. 28 May, 2006 2 commits
    • unknown's avatar
      Fixed bug#19225: unchecked error results in server crash · ae331d61
      unknown authored
      In multi-table delete a table for delete can't be used for selecting in
      subselects. Appropriate error was raised but wasn't checked which leads to a
      crash at the execution phase.
      
      The mysql_execute_command() now checks for errors before executing select
      for multi-delete.
      
      
      mysql-test/t/multi_update.test:
        Added test case for bug#19225: unchecked error results in server crash
      mysql-test/r/multi_update.result:
        Added test case for bug#19225: unchecked error results in server crash
      sql/sql_parse.cc:
        Fixed bug#19225: unchecked error results in server crash
        The mysql_execute_command() now checks for errors before executing select for multi-delete.
      ae331d61
    • unknown's avatar
      handlerton cleanup: · 0aad8083
      unknown authored
      duplicate fields removed, st_mysql_storage_engine added to support
      run-time handlerton initialization (no compiler warnings), handler API
      is now tied to MySQL version, handlerton->plugin mapping added
      (slot-based), dummy default_hton removed, plugin-type-specific
      initialization generalized, built-in plugins are now initialized too,
      --default-storage-engine no longer needs a list of storage engines
      in handle_options().
      
      mysql-test-run.pl bugfixes
      
      
      include/mysql/plugin.h:
        added st_mysql_storage_engine
        made handlerton tied to MySQL version
      mysql-test/mysql-test-run.pl:
        bugfixes (umask, --no-defaults)
      mysql-test/r/ndb_dd_basic.result:
        update error message
      mysql-test/t/partition_mgm_err2.test:
        fix typo
      sql/ha_berkeley.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_berkeley.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_federated.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_heap.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_innodb.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_innodb.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_myisam.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_myisammrg.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster_binlog.cc:
        no 'name' in the handlerton anymore
      sql/ha_partition.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/handler.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        handlerton->plugin mapping
      sql/handler.h:
        handlerton cleanup: remove duplicate fields
      sql/log.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/mysql_priv.h:
        handler.h needs plugin.h
      sql/mysqld.cc:
        Convert --default-storage-engine to a handlerton* when
        all storage engines are initialized and not in getopt
      sql/set_var.cc:
        no name in the handlerton anymore
      sql/sql_parse.cc:
        no default_hton anymore
      sql/sql_partition.cc:
        no name in the handlerton anymore
      sql/sql_plugin.cc:
        generalize plugin type-specific initialization.
        initialize built-in plugins too
      sql/sql_plugin.h:
        generalize plugin type-specific initialization.
      sql/sql_show.cc:
        st_mysql_storage_engine structure
        no name in the handlerton anymore
      sql/sql_table.cc:
        no name in the handlerton anymore
        no default_hton anymore
      sql/sql_tablespace.cc:
        no name in the handlerton anymore
        no default_hton anymore
      sql/sql_yacc.yy:
        no default_hton anymore
        issue "unknown storage engine" warning where it is discovered
      storage/archive/ha_archive.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/archive/ha_archive.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/blackhole/ha_blackhole.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/csv/ha_tina.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/example/ha_example.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      0aad8083
  20. 26 May, 2006 1 commit
    • unknown's avatar
      BUG#18681: View privileges are broken · 89444fa0
      unknown authored
      The check for view security was lacking several points :
      1. Check with the right set of permissions : for each table ref that
      participates in a view there were the right credentials to use in it's
      security_ctx member, but these weren't used for checking the credentials.
      This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
      consistently.
      2. Because of the above the security checking for views was just ruled out
      in explicit ways in several places.
      3. The security was checked only for the columns of the tables that are
      brought into the query from a view. So if there is no column reference
      outside of the view definition it was not detecting the lack of access to
      the tables in the view in SQL SECURITY INVOKER mode.
      
      The fix below tries to fix the above 3 points.
      
      
      mysql-test/r/grant.result:
        removed nondeterminism (unspecified order) in some test output
      mysql-test/r/view_grant.result:
        Somewhat extended test case for the bug and similar queries.
      mysql-test/t/grant.test:
        removed nondeterminism (unspecified order) in some test output
      mysql-test/t/view_grant.test:
        Somewhat extended test case for the bug and similar queries.
      sql/mysql_priv.h:
        A wrapper for setup_tables that also checks access to the tables
      sql/sql_acl.cc:
        removed artificial security check stop and used the table ref's credentials.
      sql/sql_base.cc:
        a wrapper for setup_tables to check access to the tables
      sql/sql_delete.cc:
        wrapper called.
      sql/sql_insert.cc:
        wrapper called
      sql/sql_load.cc:
        wrapper called
      sql/sql_parse.cc:
        wrapper called and artificial check stop removed
      sql/sql_select.cc:
        wrapper called
      sql/sql_update.cc:
        wrapper called
      sql/table.cc:
        Mask table access to the view error as well.
      89444fa0
  21. 24 May, 2006 1 commit
  22. 22 May, 2006 1 commit
    • unknown's avatar
      fix for bug #17619 Scheduler race conditions · 6b6a9b76
      unknown authored
      - Scheduler is either initialized at server start or never.
        Starting & stopping is now suspending & resuming.
      - The scheduler has clear OO interface
      - Now all calls to the scheduler are synchronous
      - GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
      - External API is encapsulated into class Events
      - Includes fixes for all comments of Kostja's review of 19.05.2005
      
      Starting to merge into 5.1-release (5.1.10) and push
      
      
      BitKeeper/etc/ignore:
        Added libmysqld/event_scheduler.cc to the ignore list
      libmysqld/Makefile.am:
        executor -> scheduler
      mysql-test/r/events.result:
        update result
      mysql-test/r/events_bugs.result:
        update result
      mysql-test/r/events_logs_tests.result:
        update result
      mysql-test/r/events_microsec.result:
        update result
      mysql-test/r/events_scheduling.result:
        update result
      mysql-test/r/events_stress.result:
        update result
      mysql-test/t/disabled.def:
        enable these tests
      mysql-test/t/events.test:
        optimize the test a bit for speed, save some seconds runtime
        remove FULL from SHOW EVENTS
        mostly use I_S.EVENTS
      mysql-test/t/events_bugs.test:
        Skip irrelevant for the current design tests - all events are loaded
        on server startup. Change in mysql.event will be visible on next server start.
        Don't use numeric error codes.
      mysql-test/t/events_logs_tests.test:
        optimize the test a bit for speed
      mysql-test/t/events_microsec.test:
         Skip irrelevant for the current design tests - all events are loaded
            on server startup. Change in mysql.event will be visible on next server start.
            Don't use numeric error codes.
      mysql-test/t/events_scheduling.test:
        broader test
      mysql-test/t/events_stress.test:
        Rework the test to the new architecture of suspending/resuming.
        Use less events, no need for thousands, hundreds is still ok.
      sql/Makefile.am:
        executor -> scheduler
      sql/cmakelists.txt:
        executor -> scheduler
      sql/event.cc:
        - remove todo comments
        - remove unneded evex_queue abstraction functions
        - move events_init() and events_shutdown() from event_executor.cc to here
        - export db_create_event
        - remove evex_load_and_compile_event, part of class Event_scheduler
        - integrate the public interface found in event.h and used by sql_parse.cc
          to use the new class Event_scheduler.
      sql/event.h:
        - add COND_finished so if one thread kills a running event it waits on this
        - export callback event_timed_definer_equal, event_timed_identifier_equal(),
          event_timed_name_equal and event_timed_db_equal()
          to be used by Event_scheduler::drop_matching_events()
        - cleanup event.h
        - encapsulated all external interface into class Events
      sql/event_executor.cc:
        make it empty, will delete after that
      sql/event_priv.h:
        - more things in the private header
        - remove event queue abstraction functions. tightly bind to QUEUE
        - export privately db_drop_event, db_find_event, db_create_event()
        - made change_security_context() and restore_security_context() free functions
      sql/event_timed.cc:
        - fix calculation of time when ENDS is set (STARTS is always set)
        - during Event_timed::compile() set the right Security_ctx. Prevents a crash
              during Event_scheduler::load_events_from_db()
        - add Event_timed::kill_thread()
        - implement event_timed_*_equal()
        - made change_security_context() and restore_security_context() free functions.
        - Comments cleanups
      sql/lex.h:
        new word scheduler for SHOW SCHEDULER STATUS (available only debug builds)
      sql/log.cc:
        move these from event_scheduler.cc
      sql/mysql_priv.h:
        refactor kill_one_thread
        export sql_print_message_func and sql_print_message_handlers
      sql/mysqld.cc:
        In close_connections, called by kill_server() skip the main scheduler
        thread and use events_shutdown() for shutting down the scheduler, in the same
        manner it's done for RPL.
        Add a new value to --event-scheduler :
        0 <- No scheduler available
        1 <- Start with scheduler enabled
        2 <- Start with scheduler suspended
      sql/repl_failsafe.cc:
        refactor thd::system_thread to be an enum
      sql/set_var.cc:
        move sys_var_event_executor::update() to set_var.cc
        executor -> scheduler
        use thd::sys_var_tmp
      sql/set_var.h:
        executor -> scheduler
      sql/share/errmsg.txt:
        3 new error messages
      sql/sql_class.cc:
        refactor thd::system_thread to be an enum . more type-safety
      sql/sql_class.h:
        refactor thd::system_thread to be an enum . more type-safety
      sql/sql_db.cc:
        get the error from evex_drop_schema_events
      sql/sql_error.h:
        export warning_level_names
      sql/sql_lex.h:
        new command SHOW SCHEDULER STATUS, available only in debug build and
        for debug purposes.
      sql/sql_parse.cc:
        refactor kill_one_thread() -> does the *dirty* work, and sql_kill
        just the reporting.
        add handler for SQLCOM_SHOW_SCHEDULER_STATUS
      sql/sql_show.cc:
        fix verbosity handling (this will be obsoleted anyway by the fix for 17394).
      sql/sql_yacc.yy:
        remove FULL from SHOW EVENTS
        add SHOW SCHEDULER STATUS in debug builds
      sql/table.cc:
        Fix valgrind warning.
      6b6a9b76
  23. 16 May, 2006 1 commit
    • unknown's avatar
      Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication): · 1a3370fd
      unknown authored
      Added #ifdef's to make code work even when the system is built without
      row-based replication.
      
      
      mysql-test/r/create.result:
        Result change
      mysql-test/r/innodb_mysql.result:
        Result change
      mysql-test/t/create.test:
        Moving InnoDB specific test to innodb_mysql.test
      mysql-test/t/innodb_mysql.test:
        Moving InnoDB-specific test from create.test
      mysql-test/t/rpl_rbr_to_sbr.test:
        Test only sensible if we have row-based replication compiled in.
      mysql-test/t/rpl_row_basic_8partition.test:
        Test only sensible if we have row-based replication compiled in.
      sql/log.cc:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/set_var.cc:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/set_var.h:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/share/errmsg.txt:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/sql_base.cc:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/sql_class.cc:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/sql_class.h:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/sql_insert.cc:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/sql_parse.cc:
        Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
        row-based replication.
      sql/sql_table.cc:
        Not running hooks
      1a3370fd
  24. 10 May, 2006 1 commit
    • unknown's avatar
      Follow-up for the patch for bugs #12472/#15137 "CREATE TABLE ... SELECT ... · 1684a1ea
      unknown authored
      which explicitly or implicitly uses stored function gives 'Table not locked'
      error"
      
      Test case for these bugs crashed in --ps-protocol mode. The crash was caused
      by incorrect usage of check_grant() routine from create_table_precheck()
      routine. The former assumes that either number of tables to be inspected by
      it is limited explicitly (i.e. is is not UINT_MAX) or table list used and
      thd->lex->query_tables_own_last value correspond to each other.
      create_table_precheck() was not fulfilling this condition and crash happened.
      The fix simply sets number of tables to be inspected by check_grant() to 1.
      
      
      sql/sql_parse.cc:
        create_table_precheck():
          At the moment when create_table_precheck() is called TABLE_LIST element
          representing table to be created does not belong to global table list
          therefore we should limit number of tables to be inspected by check_grant()
          explicitly (as in this case table list passed to this function does not
          correspond to thd->lex->query_tables_own_last value).
      1684a1ea
  25. 06 May, 2006 1 commit
    • unknown's avatar
      Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running) · 3d45a067
      unknown authored
      after merge.
      
      Concurrent read and update of privilege structures (like simultaneous
      run of SHOW GRANTS and ADD USER) could result in server crash.
      
      Ensure that proper locking of ACL structures is done.
      
      No test case is provided because this bug can't be reproduced
      deterministically.
      
      
      sql/sql_acl.cc:
        Ensure that access to ACL data is protected by acl_cache->lock mutex.
        Use system_charset_info for host names consistently.
        Remove check_acl_user().  Use find_acl_user() instead.
      sql/sql_acl.h:
        Remove check_acl_user() declaration.
      sql/sql_parse.cc:
        Use is_acl_user() instead of check_acl_user().
      3d45a067
  26. 05 May, 2006 1 commit
    • unknown's avatar
      Don't use row level logging on optimize or repair table. · 78fcb9a8
      unknown authored
      (Fixes core dump in rpl_failed_optimize.test)
      Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      
      
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
        Added extra test + drop of table at end of test
      mysql-test/lib/mtr_report.pl:
        Fail if mysqld asserts or prints stack
      mysql-test/mysql-test-run.sh:
        Fail if mysqld asserts or prints stack
      mysql-test/r/exampledb.result:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/r/innodb.result:
        Extra test to see that we can do an optimize table on an active transaction
      mysql-test/r/rpl_failed_optimize.result:
        Added extra test + drop of table at end of test
      mysql-test/t/exampledb.test:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/t/innodb.test:
        Extra test to see that we can do an optimize table on an active transaction
      sql/handler.cc:
        Don't use row level logging on optimize or repair table.
      sql/log.cc:
        Simplify code (no logic changes)
      sql/mysql_priv.h:
        Added prototype
      sql/sql_base.cc:
        Better name for define
      sql/sql_class.cc:
        Indentation fix
      sql/sql_parse.cc:
        Make end_active_trans() global
      sql/sql_table.cc:
        Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      78fcb9a8
  27. 04 May, 2006 1 commit
  28. 03 May, 2006 3 commits
    • unknown's avatar
      Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line) · 0da39e97
      unknown authored
      There were two distict bugs: parse error was returned for valid
      statement and that error wasn't reported to the client.
      
      The fix ensures that EXPLAIN SELECT..INTO is accepted by parser and any
      other parse error will be reported to the client.
      
      
      mysql-test/r/explain.result:
        Add result for bug#15463.
      mysql-test/t/explain.test:
        Add test case for bug#15463.
      sql/sql_parse.cc:
        Assert that if parsing error has occured then apropriate error message
        has been pushed into error stack.
      sql/sql_yacc.yy:
        If there is no lex->result in select_var_ident rule, then we have
        to be in DESCRIBE mode.
      0da39e97
    • unknown's avatar
      Added support for key_block_size for key and table level (WL#602) · 0ab1abad
      unknown authored
      Added support for key_block_size to MyISAM.
      Simplify interface to 'new Key' to make it easier to add new key options.
      mysqld option --new is used to define where key options are printed.
      (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
      Fixed some compiler warnings and a memory leak in ssl
      
      
      include/my_base.h:
        Added flag to check if block size for key was secified
      include/my_sys.h:
        Added new support function to round up to a power of two
      include/myisam.h:
        Rename block_size -> block_size_index to avoid confusion with 'block_size'
      include/violite.h:
        Added function to free memory after new_VioSSLAcceptorFd
        (Will rename all vio_ssl functions in a future changeset)
      mysql-test/mysql-test-run.pl:
        Don't print port number info when we use --extern
      mysql-test/r/myisam.result:
        Added test for key_block_size
      mysql-test/t/myisam.test:
        Added test for key_block_size
      mysys/mf_keycache.c:
        Simplify code
      mysys/my_bit.c:
        Added new support function to round up to a power of two
      sql/ha_myisam.cc:
        Tell MyISAM to use the specified key_block_size
        MyISAM also updates the global key_block_size from the used values.
      sql/handler.cc:
        Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key'
      sql/handler.h:
        Added KEY_CREATE_INFO, to be used as for general options for KEY's
      sql/item_func.h:
        Removed compiler warning
      sql/lex.h:
        Added new symbol
      sql/mysqld.cc:
        Fixed memory leak in ssl (new_VioSSLAcceptorFd)
      sql/sql_class.h:
        Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size.
        This makes it easier to add new key options in the future.
      sql/sql_lex.h:
        Added key create options
      sql/sql_parse.cc:
        Use new interface to 'new Key'
      sql/sql_show.cc:
        Added support for key_block_size
        If --new is used, key options are printed after the key part definition.
      sql/sql_table.cc:
        Use new interface to 'new Key'
        Add support for key_block_size
      sql/sql_yacc.yy:
        Add support for key_block_size
        Allow key options before and after key_parts (In future they should be always after the key_part defintion)
        Use new interface to 'new Key'
      sql/structs.h:
        Added block_size to keys
      sql/table.cc:
        Remmeber and read key_block_size for table and key level
      sql/table.h:
        Added default key_block_size for table
      sql/unireg.cc:
        Remember key_block_size for key
      storage/myisam/ft_eval.c:
        Set block_length to 0 to get default key page size
      storage/myisam/ft_test1.c:
        Set block_length to 0 to get default key page size
      storage/myisam/mi_check.c:
        block_size -> block_size_index
      storage/myisam/mi_create.c:
        Added support for block size per key.
        Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH.
        Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size.
      storage/myisam/mi_open.c:
        block_size -> block_size_index
      storage/myisam/mi_page.c:
        block_size -> block_size_index
      storage/myisam/mi_test1.c:
        Set block_length to 0 to get default key page size
      storage/myisam/mi_test2.c:
        Set block_length to 0 to get default key page size
      storage/myisam/mi_test3.c:
        Set block_length to 0 to get default key page size
      storage/myisam/myisamdef.h:
        block_size -> block_size_index to avoid confusion with 'block_size' in MySQL
        Added block_size as argument to MI_BLOCK_SIZE
        Added missing prototypes to get rid of compiler warnings
      storage/myisam/myisampack.c:
        Removed compiler warning
        block_size -> block_size_index
      vio/viosslfactories.c:
        Fixed memory leak in ssl (new_VioSSLAcceptorFd)
      mysql-test/r/myisam-system.result:
        New BitKeeper file ``mysql-test/r/myisam-system.result''
      mysql-test/t/myisam-system.test:
        New BitKeeper file ``mysql-test/t/myisam-system.test''
      0ab1abad
    • unknown's avatar
      Added new show contributors command. · aeb39dd3
      unknown authored
      sql/lex.h:
        Additions for show contributors
      sql/mysql_priv.h:
        Show contributors addition
      sql/sp_head.cc:
        Added for show contributors
      sql/sql_lex.h:
        Adding contributors addition
      sql/sql_parse.cc:
        Execute for add contributors
      sql/sql_show.cc:
        Adding show contributors
      sql/sql_yacc.yy:
        Show contributors additio
      mysql-test/r/contributors.result:
        New BitKeeper file ``mysql-test/r/contributors.result''
      mysql-test/t/contributors.test:
        New BitKeeper file ``mysql-test/t/contributors.test''
      sql/contributors.h:
        New BitKeeper file ``sql/contributors.h''
      aeb39dd3
  29. 02 May, 2006 1 commit
    • unknown's avatar
      sql_parse.cc: · deaedeaf
      unknown authored
        buffer overflow and information exposure bugs fixed
        (reported by Stefano Di Paola)
      configure.in:
        Changed version to 5.0.17b
      
      
      configure.in:
        Changed version to 5.0.17b
      sql/sql_parse.cc:
        buffer overflow and information exposure bugs fixed
        (reported by Stefano Di Paola)
      deaedeaf