1. 21 Jun, 2010 1 commit
    • Marko Mäkelä's avatar
      Merge Bug #54658 fix from mysql-5.1-innodb: · c9242114
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3515
      revision-id: marko.makela@oracle.com-20100621094008-o9fa153s3f09merw
      parent: vasil.dimov@oracle.com-20100618085155-xnm469cbhedqea96
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Mon 2010-06-21 12:40:08 +0300
      message:
        Bug #54658: InnoDB: Warning: allocated tablespace %lu, old maximum was 0
      
        dict_check_tablespaces_and_store_max_id(): Initialize max_space_id
        and fil_system->max_assigned_id from DICT_HDR_MAX_SPACE_ID.
      
        fil_space_create(): Suppress the warning unless !recv_recovery_on
        (do not complain while applying the redo log).
      c9242114
  2. 17 Jun, 2010 7 commits
  3. 15 Jun, 2010 10 commits
  4. 14 Jun, 2010 7 commits
    • Vasil Dimov's avatar
      0602f1ef
    • Bjorn Munch's avatar
      Upmerge and port 46882 · cd756eb3
      Bjorn Munch authored
      cd756eb3
    • Bjorn Munch's avatar
      Upmerge and port 46882 · 9a843793
      Bjorn Munch authored
      9a843793
    • Bjorn Munch's avatar
      Bug #46882 Suite timeout doesn't kill stray processes · e90fc90d
      Bjorn Munch authored
      Kill mysqltest and call mtr_kill_leftovers() before terminating
      e90fc90d
    • Tor Didriksen's avatar
      Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling with cmake · 675bf291
      Tor Didriksen authored
      Let mtr lookup the plugins, rather than hard-coding autotools lib path.
      
      
      mysql-test/include/not_parallel.inc:
        Add new feature for skipping when running in parallel.
      mysql-test/mysql-test-run.pl:
        Use find_plugin to locate plugins.
        Export opt_parallel in environment.
      mysql-test/suite/federated/federated_plugin-master.opt:
        Use plugin dir from mtr.
      mysql-test/suite/federated/federated_plugin.test:
        Skip test, disabled.
      mysql-test/t/archive_plugin-master.opt:
        Use plugin dir from mtr.
      mysql-test/t/archive_plugin.test:
        Skip test if running in parallel.
      mysql-test/t/blackhole_plugin-master.opt:
        Use plugin dir from mtr.
      mysql-test/t/blackhole_plugin.test:
        Skip test if running in parallel.
      675bf291
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · c63e8763
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3507
      revision-id: marko.makela@oracle.com-20100610125623-ar6qf4w2pv2kr7mb
      parent: sergey.glukhov@sun.com-20100609121718-04mpk5kjxvnrxdu8
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Thu 2010-06-10 15:56:23 +0300
      message:
        Bug #38999: Re-enable innodb_multi_update.test
      c63e8763
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · ec8a3209
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3506
      revision-id: sergey.glukhov@sun.com-20100609121718-04mpk5kjxvnrxdu8
      parent: sergey.glukhov@sun.com-20100609120734-ndy2281wau9067zv
      committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
      branch nick: mysql-5.1-innodb
      timestamp: Wed 2010-06-09 16:17:18 +0400
      message:
        Bug#38999 valgrind warnings for update statement in function compare_record()
        (InnoDB plugin branch)
      
       @ mysql-test/suite/innodb_plugin/r/innodb_mysql.result
          test case
      
       @ mysql-test/suite/innodb_plugin/t/innodb_mysql.test
          test case
      
       @ storage/innodb_plugin/row/row0sel.c
          init null bytes with default values as they might be
          left uninitialized in some cases and these uninited bytes
          might be copied into mysql record buffer that leads to
          valgrind warnings on next use of the buffer.
      ec8a3209
  5. 12 Jun, 2010 2 commits
  6. 11 Jun, 2010 12 commits
  7. 10 Jun, 2010 1 commit
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- · fd4b3c6c
      Davi Arnaut authored
                  strict aliasing violations.
      
      One somewhat major source of strict-aliasing violations and
      related warnings is the SQL_LIST structure. For example,
      consider its member function `link_in_list` which takes
      a pointer to pointer of type T (any type) as a pointer to
      pointer to unsigned char. Dereferencing this pointer, which
      is done to reset the next field, violates strict-aliasing
      rules and might cause problems for surrounding code that
      uses the next field of the object being added to the list.
      
      The solution is to use templates to parametrize the SQL_LIST
      structure in order to deference the pointers with compatible
      types. As a side bonus, it becomes possible to remove quite
      a few casts related to acessing data members of SQL_LIST.
      
      sql/handler.h:
        Use the appropriate template type argument.
      sql/item.cc:
        Remove now-unnecessary cast.
      sql/item_subselect.cc:
        Remove now-unnecessary casts.
      sql/item_sum.cc:
        Use the appropriate template type argument.
        Remove now-unnecessary cast.
      sql/mysql_priv.h:
        Move SQL_LIST structure to sql_list.h
        Use the appropriate template type argument.
      sql/sp.cc:
        Remove now-unnecessary casts.
      sql/sql_delete.cc:
        Use the appropriate template type argument.
        Remove now-unnecessary casts.
      sql/sql_derived.cc:
        Remove now-unnecessary casts.
      sql/sql_lex.cc:
        Remove now-unnecessary casts.
      sql/sql_lex.h:
        SQL_LIST now takes a template type argument which must
        match the type of the elements of the list. Use forward
        declaration when the type is not available, it is used
        in pointers anyway.
      sql/sql_list.h:
        Rename SQL_LIST to SQL_I_List. The template parameter is
        the type of object that is stored in the list.
      sql/sql_olap.cc:
        Remove now-unnecessary casts.
      sql/sql_parse.cc:
        Remove now-unnecessary casts.
      sql/sql_prepare.cc:
        Remove now-unnecessary casts.
      sql/sql_select.cc:
        Remove now-unnecessary casts.
      sql/sql_show.cc:
        Remove now-unnecessary casts.
      sql/sql_table.cc:
        Remove now-unnecessary casts.
      sql/sql_trigger.cc:
        Remove now-unnecessary casts.
      sql/sql_union.cc:
        Remove now-unnecessary casts.
      sql/sql_update.cc:
        Remove now-unnecessary casts.
      sql/sql_view.cc:
        Remove now-unnecessary casts.
      sql/sql_yacc.yy:
        Remove now-unnecessary casts.
      storage/myisammrg/ha_myisammrg.cc:
        Remove now-unnecessary casts.
      fd4b3c6c