1. 21 Nov, 2006 3 commits
  2. 16 Nov, 2006 1 commit
    • marko's avatar
      Merge a change from MySQL AB. · 0fb091df
      marko authored
      ChangeSet
        2006/11/10 17:22:43+02:00 aelkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi 
        Bug #24190  many exportable definitions of field_in_record_is_null
        
        mysql had several(2) exportable definitions of field_in_record_is_null function.
        
        Fixed with adding static.
      
      storage/innobase/handler/ha_innodb.cc
        2006/11/10 17:22:36+02:00 aelkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi +1 -1
        made static
      0fb091df
  3. 10 Nov, 2006 2 commits
  4. 09 Nov, 2006 2 commits
  5. 08 Nov, 2006 3 commits
  6. 03 Nov, 2006 1 commit
  7. 30 Oct, 2006 2 commits
  8. 26 Oct, 2006 1 commit
    • marko's avatar
      innodb.result, innodb_mysql.result: Merge changes from MySQL AB: · 58fe21c8
      marko authored
      ChangeSet
        2006/10/09 19:51:41+04:00 gkodinov@macbook.local 
        Bug #22781: SQL_BIG_RESULT fails to influence sort plan
         Currently SQL_BIG_RESULT is checked only at compile time.
         However, additional optimizations may take place after
         this check that change the sort method from 'filesort'
         to sorting via index. As a result the actual plan
         executed is not the one specified by the SQL_BIG_RESULT
         hint. Similarly, there is no such test when executing
         EXPLAIN, resulting in incorrect output.
         The patch corrects the problem by testing for
         SQL_BIG_RESULT both during the explain and execution
         phases.
      58fe21c8
  9. 19 Oct, 2006 1 commit
  10. 18 Oct, 2006 1 commit
  11. 16 Oct, 2006 2 commits
  12. 12 Oct, 2006 1 commit
  13. 10 Oct, 2006 2 commits
  14. 09 Oct, 2006 3 commits
  15. 06 Oct, 2006 1 commit
  16. 05 Oct, 2006 2 commits
    • marko's avatar
      Merge changes from MySQL AB. · fcbfbc4c
      marko authored
      dict_col_copy_type_noninline(): Remove the return statement.
      Some compilers do not allow return expressions of void type.
      
      innobase_start_or_create_for_mysql(): Do not cap srv_max_threads to 1000
      on Windows.
      
      Makefile.am (EXTRA_DIST): Add plug.in
      fcbfbc4c
    • marko's avatar
      Merge changes to mysql-test from MySQL AB. · ccc8e799
      marko authored
      innodb_unsafe_binlog, innodb_handler, innodb-big, innodb_cache-master,
      innodb-deadlock, innodb_cache: Remove.  These have been renamed in the
      MySQL tree.
      
      innodb_mysql: Update.
      ccc8e799
  17. 03 Oct, 2006 3 commits
    • marko's avatar
      storage/innobase/handler: Merge changes from MySQL AB: · d3c13fb0
      marko authored
      ChangeSet
        2006/09/30 18:44:42-07:00 brian@zim.(none) 
        Merge zim.(none):/home/brian/mysql/merge-5.1
        into  zim.(none):/home/brian/mysql/arch-5.1
      
      ChangeSet
        2006/09/30 12:49:46-07:00 brian@zim.(none) 
        This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
        Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 
      
      ChangeSet
        2006/09/29 17:19:02-07:00 brian@zim.(none) 
        This removes the passing of global hton to engine instance. 
      
      ChangeSet
        2006/09/28 13:22:56+02:00 gbichot@dl145h.mysql.com 
        Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch
        into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
      
      ChangeSet
        2006/09/28 13:19:43+02:00 gbichot@dl145h.mysql.com 
        In the handlerton, cursor creation function don't have an argument
        and so the engine calls current_thd to derive transaction information;
        instead we now pass THD to those functions, it looks more logical
        (it makes the implicit current_thd parameter more visible).
        Approved by Brian and Monty.
      
      ChangeSet
        2006/09/26 22:51:53-07:00 brian@zim.(none) 
        Merge zim.(none):/home/brian/mysql/merge-5.1
        into  zim.(none):/home/brian/mysql/arch-5.1
      d3c13fb0
    • marko's avatar
      setup.sh: Once more. Remember that the glob expansion works relative to · c50358f6
      marko authored
      the current directory.
      c50358f6
    • marko's avatar
  18. 02 Oct, 2006 1 commit
  19. 26 Sep, 2006 2 commits
  20. 22 Sep, 2006 1 commit
  21. 21 Sep, 2006 1 commit
  22. 20 Sep, 2006 4 commits