1. 29 Jan, 2007 3 commits
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 2f6812be
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-24392
      
      
      2f6812be
    • unknown's avatar
      Fix for bug#22740 Events: Decouple Event_queue from Event_db_repository · 3c39b0d8
      unknown authored
      This patch implements the idea of the bug report by making Event_queue
      unaware of Event_db_repository by making a higher level class - Events,
      which is aware of most of all classes, responsible for passing all data
      needed for adding/updating/deleting an event to/from the queue.
      
      Introduces few new classes :
       - Event_worker_thread
       - Event_queue_element_for_exec
      
      
      sql/event_data_objects.cc:
        Introduced a new class Event_queue_element_for_exec
        According to Konstantin it should be named Event_name and hold
        only two LEX_STRINGs but `dropped` is not saved on disk and will
        require additional logic in Event_worker_thread class, after loading
        to compute whether the event should be dropped or not. It's easier
        just to pass this flag around.
        
        Removed Event_queue_element::drop(). This method was a source of a
        race condition. At the place where the event should be dropped we
        call Events::drop_event() which is the only code-flow for dropping.
        In addition, because ::drop_event() holds Events::LOCK_metadata there is
        no source of race conditions. Before this patch dropping from ::drop()
        wasn't under LOCK_metadata and races were possible.
        
        Because Events::open_event_table was removed as a method, provisionally
        events_event_db_repository was exported from events.cc till a solution is
        build where Event_queue_element does not access directly mysql.event.
      sql/event_data_objects.h:
        New class Event_queue_element_for_exec added which is returned
        from Event_queue::get_top_if_time() and passed through Event_scheduler
        to Event_worker_thread. There by using the (db)name Event_job_data is
        instanciated and executed.
        
        Dropped Event_queue_element::drop()
        
        thd was moved out of Event_job_data as it is now part of
        Event_queue_element_for_exec
      sql/event_queue.cc:
        Removed dependency of Event_queue on Event_db_repository.
        The instantiation of Event_job_data was moved to class Event_worker_thread
        In place is a return of an object of Event_queue_element_for_exec is used
        later for instantiating Event_job_data.
        
        The `dropped` flag of Event_queue_element is passed over
        Event_queue_element_for_exec to the code in Event_worker_thread.
      sql/event_queue.h:
        Removed dependency of Event_queue on Event_db_repository
        Removed dependency on Event_scheduler
      sql/event_scheduler.cc:
        Added class Event_worker_thread, which is used during
        the execution of an event. It has a static init() method
        to get a pointer to Event_db_repository to be used for
        instantiation of Event_job_data object. This object it then
        executed.
      sql/event_scheduler.h:
        Added class Event_worker_thread, which is used during
        the execution of an event.
      sql/events.cc:
        Removed Events::open_event_table() because it was a product of
        a bad architecture.
      sql/events.h:
        Removed friend definition, unneeded.
        
        Fixed Events::drop_event() to have the previous signature without
        bool only_from_disk
      sql/sql_parse.cc:
        Fix call
      3c39b0d8
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 6b9f56e3
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-24392
      
      
      mysql-test/t/show_check.test:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      6b9f56e3
  2. 25 Jan, 2007 14 commits
  3. 24 Jan, 2007 23 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 247bd923
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Use local.
      mysql-test/t/myisam.test:
        Use local.
      247bd923
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 1cf81178
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      1cf81178
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 53491b18
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
      
      
      Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      53491b18
    • unknown's avatar
      Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected) · 39cc6d11
      unknown authored
      The build scripts in general, using automake, autoconf, etc, contain several
      special commands and work around all related to the way the bison code in the
      parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
      time during development, ultimately cause the build scripts to be unstable
      and cause build defects by not enforcing dependencies.
      
      This fix simplifies the build process and aligns it with the automake tooling,
      which provides native support for bison and *.yy files.
      
      In particular, the following problem have been fixed:
      - dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
        corrupted builds,
      - the work around introduced by Bug 24557, to cleanup the generated files
        sql_yacc.h and sql_yacc.cc, has been removed,
      - the generated makefile, in a source distribution, used to destroy the files
        sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
        these files are now removed by make maintainer-clean.
      - The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
        clearly documented, and the "sed" hack has been replaced by a cleaner
        work around, when building the code with bison 1.875.
      - Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
      - Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
        the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
      
      
      BitKeeper/deleted/.del-sql_yacc.yy.bak:
        Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak
      Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/sql_yacc.yy:
        General cleanup of the build process for sql_yacc.yy
      39cc6d11
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 2ed7eaf5
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/t/myisam.test:
        Auto merged
      2ed7eaf5
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · c26ffedb
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      c26ffedb
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge · 5c0216c5
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      mysql-test/t/ps.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/t/disabled.def:
        Manual merge.
      5c0216c5
    • unknown's avatar
      Disabling back im_daemon_life_cycle.test, which was temporarily enabled in · 259a4658
      unknown authored
      the team tree for additional investigation.
      
      
      259a4658
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7b109de6
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      7b109de6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 491ef6af
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      491ef6af
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 6bb5fd6b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug24607
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      6bb5fd6b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · e8ca911f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24607
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      e8ca911f
    • unknown's avatar
      After merge fix · 89f02b13
      unknown authored
      89f02b13
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug24607 · 389388f1
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24607
      
      
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/r/myisam.result:
        Manual merged
      389388f1
    • unknown's avatar
      Bug#24607 - MyISAM pointer size determined incorrectly · ccb002db
      unknown authored
      After merge fix
      
      
      ccb002db
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug24607 · 4f73c75f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug24607
      
      
      mysql-test/r/myisam.result:
        Manual merged
      mysql-test/t/myisam.test:
        Manual merged
      4f73c75f
    • unknown's avatar
      Bug#24607 - MyISAM pointer size determined incorrectly · 112ef50f
      unknown authored
      Fixed test. On 32-bit machines which compile without
      -DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
      Using a value below 4G is portable.
      
      
      mysql-test/r/myisam.result:
        Bug#24607 - MyISAM pointer size determined incorrectly
        Fixed test results.
      112ef50f
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · bb5dccf2
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      bb5dccf2
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · e57ef96a
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
      
      
      e57ef96a
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines · 8b405d4f
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      8b405d4f
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 6216e794
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
      
      
      6216e794
    • unknown's avatar
      After merge fix. · 5e0fd916
      unknown authored
      5e0fd916
    • unknown's avatar
      Fixed test case after merging fix for bug#24491 "using alias from source · 07b6b2f8
      unknown authored
      table in insert ... on duplicate key" in 5.1 tree.
      
      
      mysql-test/t/sp-error.test:
        After merge fix.
      07b6b2f8