1. 28 May, 2010 1 commit
  2. 27 May, 2010 6 commits
  3. 26 May, 2010 5 commits
  4. 25 May, 2010 7 commits
  5. 24 May, 2010 6 commits
    • Mattias Jonsson's avatar
      merge · b0ecceb9
      Mattias Jonsson authored
      b0ecceb9
    • Vasil Dimov's avatar
      Merge a changeset from mysql-5.1-innodb: · 080a0aab
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3477
        revision-id: vasil.dimov@oracle.com-20100520132735-a120y85kqmhp7hxi
        parent: vasil.dimov@oracle.com-20100520125403-3u9ydcfu8vz8spls
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-05-20 16:27:35 +0300
        message:
          Disable main.ps_3innodb for valgrind tests since it results in known
          failures, that are described in
          
          Bug#38999 valgrind warnings for update statement in function compare_record()
          
          At the time I am adding this the failures are:
          
          main.ps_3innodb                          [ fail ]  Found warnings/errors in server log file!
                  Test ended at 2010-05-20 01:17:34
          line
          ==31559== Thread 11:
          ==31559== Conditional jump or move depends on uninitialised value(s)
          ==31559==    at 0x75C5BD: compare_record(st_table*) (sql_update.cc:35)
          ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
          ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
          ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
          ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
          ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
          ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
          ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
          ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
          ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
          ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
          ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
          ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
          ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
          ==31559== Conditional jump or move depends on uninitialised value(s)
          ==31559==    at 0x75C5D0: compare_record(st_table*) (sql_update.cc:35)
          ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
          ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
          ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
          ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
          ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
          ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
          ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
          ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
          ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
          ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
          ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
          ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
          ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
          ^ Found warnings in /export/home4/pb2/test/sb_3-1827397-1274300957.87/mysql-5.1.48-linux-x86_64-test/mysql-test/var-n_mix/log/mysqld.1.err
      080a0aab
    • Vasil Dimov's avatar
      Disable the tests on embedded windows that fail due to · 9f42efeb
      Vasil Dimov authored
      Bug #53947 InnoDB: Assertion failure in thread 4224 in file
      .\sync\sync0sync.c line 324
      
      This changeset should be reverted once the bug is fixed.
      9f42efeb
    • Vasil Dimov's avatar
    • Mattias Jonsson's avatar
      Merge of bug#51851. · d7e7afd4
      Mattias Jonsson authored
      Also moved HA_DATA_PARTITION from ha_partition.cc to table.h.
      d7e7afd4
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · 42eff810
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3479
      revision-id: marko.makela@oracle.com-20100524110439-fazi70rlmt07tzd9
      parent: vasil.dimov@oracle.com-20100520133157-42uk5q3pp0vsinac
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Mon 2010-05-24 14:04:39 +0300
      message:
        Bug#53578: assert on invalid page access, in fil_io()
      
        Store the max_space_id in the data dictionary header in order to avoid
        space_id reuse.
      
        DICT_HDR_MIX_ID: Renamed to DICT_HDR_MAX_SPACE_ID, DICT_HDR_MIX_ID_LOW.
      
        dict_hdr_get_new_id(): Return table_id, index_id, space_id or a subset of them.
      
        fil_system_t: Add ibool space_id_reuse_warned.
      
        fil_create_new_single_table_tablespace(): Get the space_id from the caller.
      
        fil_space_create(): Issue a warning if the fil_system->max_assigned_id
        is exceeded.
      
        fil_assign_new_space_id(): Return TRUE/FALSE and take a pointer to the
        space_id as a parameter. Make the function public.
      
        fil_init(): Initialize all fil_system fields by mem_zalloc(). Remove
        explicit initializations of certain fields to 0 or NULL.
      42eff810
  6. 23 May, 2010 1 commit
  7. 21 May, 2010 10 commits
  8. 20 May, 2010 4 commits
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · 8344f58a
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3475
      revision-id: marko.makela@oracle.com-20100520130734-ueow9mn60czp7o4m
      parent: marko.makela@oracle.com-20100520104042-ma2nsscqdvwoph8k
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Thu 2010-05-20 16:07:34 +0300
      message:
        buf_LRU_free_block(): Correct an error in the comment.
      8344f58a
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · 525768dd
      Marko Mäkelä authored
      TO DO: Enable this in CMake-based builds.
      
      ------------------------------------------------------------
      revno: 3474
      revision-id: marko.makela@oracle.com-20100520104042-ma2nsscqdvwoph8k
      parent: marko.makela@oracle.com-20100519081618-h38q02qxuvcowbtk
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Thu 2010-05-20 13:40:42 +0300
      message:
        Bug#53593: Add some instrumentation to improve Valgrind sensitivity
      
        BUILD/*: Add valgrind_configs=--with-valgrind.
        BUILD/*: Remove -USAFEMALLOC from valgrind_flags.
      
        configure.in: Add AC_ARG_WITH(valgrind) and HAVE_VALGRIND.
      
        include/my_sys.h: Define a number of MEM_ wrappers for VALGRIND_ functions.
        include/my_sys.h: Make TRASH do MEM_UNDEFINED().
      
        include/m_string.h: Remove unused macro bzero_if_purify(A,B).
      
        _mymalloc(): Declare MEM_UNDEFINED() on the allocated memory.
      
        _myfree(): Declare MEM_NOACCESS() on the freed memory.
      
        storage/innobase/include/univ.i: Enable UNIV_DEBUG_VALGRIND based on
        HAVE_VALGRIND rather than HAVE_purify.
      
        Possible things to do:
         * In my_global.h, remove the defined(HAVE_purify) condition
           from the _WIN32 uint3korr().
         * In my_global.h *int*korr(), use | instead of +
           in order to keep the Valgrind V bits accurate
         * Consider replacing HAVE_purify with HAVE_VALGRIND
         * Use VALGRIND_CREATE_BLOCK, VALGRIND_DISCARD in mem_root and similar places
      525768dd
    • Alexander Nozdrin's avatar
      Empty merge from mysql-trunk. · 534b3a52
      Alexander Nozdrin authored
      534b3a52
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · d8b33c52
      Alexander Nozdrin authored
      d8b33c52