1. 14 Aug, 2013 3 commits
    • Sergei Golubchik's avatar
      raise a version · 51e28066
      Sergei Golubchik authored
      51e28066
    • Sergey Vojtovich's avatar
      f3d26cb1
    • Sergey Vojtovich's avatar
      MDEV-4702 - Reduce usage of LOCK_open · b7f9c894
      Sergey Vojtovich authored
      Following variables do not require LOCK_open protection anymore:
      - table_def_cache (renamed to tdc_hash) is protected by rw-lock
        LOCK_tdc_hash;
      - table_def_shutdown_in_progress doesn't need LOCK_open protection;
      - last_table_id use atomics;
      - TABLE_SHARE::ref_count (renamed to TABLE_SHARE::tdc.ref_count)
        is protected by TABLE_SHARE::tdc.LOCK_table_share;
      - TABLE_SHARE::next, ::prev (renamed to tdc.next and tdc.prev),
        oldest_unused_share, end_of_unused_share are protected by
        LOCK_unused_shares;
      - TABLE_SHARE::m_flush_tickets (renamed to tdc.m_flush_tickets)
        is protected by TABLE_SHARE::tdc.LOCK_table_share;
      - refresh_version (renamed to tdc_version) use atomics.
      b7f9c894
  2. 13 Aug, 2013 2 commits
  3. 12 Aug, 2013 10 commits
  4. 08 Aug, 2013 3 commits
  5. 07 Aug, 2013 6 commits
  6. 06 Aug, 2013 1 commit
    • Sergey Vojtovich's avatar
      MDEV-4801 - Server crashes in my_strdup on setting · 5997156b
      Sergey Vojtovich authored
                  innodb_ft_user_stopword_table to DEFAULT
      
      Setting plugin string variable with PLUGIN_VAR_MEMALLOC flag
      to NULL causes server crash.
      
      mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result:
        Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
      mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test:
        Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
      sql/sql_plugin.cc:
        When we got NULL value, do not strdup(NULL).
      5997156b
  7. 05 Aug, 2013 2 commits
  8. 04 Aug, 2013 1 commit
  9. 02 Aug, 2013 4 commits
    • Sergey Petrunya's avatar
      Automatic merge · cb5de276
      Sergey Petrunya authored
      cb5de276
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · d845bcc3
      Sergey Vojtovich authored
      Fixed perfschema.relaylog failure.
      
      mysql-test/suite/perfschema/r/relaylog.result:
        Failed file opens are not shown in P_S. Relevant revision:
        marc.alff@oracle.com-20120807154151-cwuazxu341rvrnmg
      d845bcc3
    • Sergey Petrunya's avatar
      MDEV-4816: rpl.rpl_trunc_temp fails in 10.0-serg · 5c49041b
      Sergey Petrunya authored
      Temorary fix for a number of replication tests (rpl.rpl_temp_table_mix_row 
      rpl.rpl_trunc_temp rpl.rpl_current_user rpl.rpl_gtid_master_promote):
      
      - THD::decide_logging_format() should not assume that mysql.gtid_slave_pos is 
        a non-replicated table. This used to cause unintended behavior for COMMIT 
        statement: replication would switch to row-based, etc.
      
      The question of what should be done when a user issues a statement that
      explicitly modifies mysql.gtid_slave_pos table remains open.
      5c49041b
    • Alexander Barkov's avatar
      MDEV-4786 merge 10.0-monty > 10.0 · 4d15abf2
      Alexander Barkov authored
      Workaround for a possible GCC bug happening in my_fill_ucs2:
      http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58039
      
      Commenting out the optimized loop.
      Using the original MySQL version.
      
      modified:
        strings/ctype-ucs2.c
      4d15abf2
  10. 01 Aug, 2013 6 commits
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 3a1e8226
      Sergey Vojtovich authored
      Fixed parts.partition_mgm_lc2_innodb, parts.partition_mgm_lc2_archive,
      parts.partition_mgm_lc2_memory, parts.partition_mgm_lc2_myisam failures.
      
      Applied lost changes from revision
      mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
      
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
        Applied lost changes from revision
        mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
      mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
        Applied lost changes from revision
        mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
      mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
        Applied lost changes from revision
        mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
      mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
        Applied lost changes from revision
        mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
      3a1e8226
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · bd68d38c
      Sergey Vojtovich authored
      Fixed main.plugin, main-test_sql_discovery.plugin failures.
      
      storage/example/ha_example.cc:
        Issue a warning independently of DBUG status (needed for testing).
      bd68d38c
    • Alexander Barkov's avatar
      Merging my_convert() from 10.0-serg · 24044566
      Alexander Barkov authored
      modified:
        include/m_ctype.h
        mysys/ma_dyncol.c
        mysys/string.c
        sql/sql_string.cc
        sql/sql_string.h
        strings/ctype.c
      24044566
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · be995467
      Sergey Vojtovich authored
      Fixed main.partition_open_files_limit, innodb.innodb_bug12400341 failures.
      
      These testcases use --max-connections=N command line option, which
      was declared PARSE_EARLY during the merge. Embedded didn't handle
      early options and failed to start due to unknown command line
      option.
      
      libmysqld/lib_sql.cc:
        Let embedded handle early options.
      sql/mysqld.cc:
        Moved handling of early options to a separate function.
      sql/mysqld.h:
        Moved handling of early options to a separate function.
      be995467
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · d89b19d4
      Sergey Vojtovich authored
      Fixed funcs_1.is_statistics_mysql_embedded, funcs_1.is_columns_mysql_embedded,
      funcs_1.is_table_constraints_mysql_embedded, funcs_1.is_tables_mysql_embedded
      failures.
      
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
        Applied same changes as to non-embedded counterpart.
      mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result:
        Applied same changes as to non-embedded counterpart.
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result:
        Applied same changes as to non-embedded counterpart.
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
        Applied same changes as to non-embedded counterpart.
      d89b19d4
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 6664e737
      Sergey Vojtovich authored
      Fixed main.partition_cache, main.partition_cache_innodb,
      main.partition_cache_myisam, main.query_cache failures.
      
      libmysqld/emb_qcache.cc:
        Restore proper method to retrieve warnings number.
      6664e737
  11. 31 Jul, 2013 2 commits