1. 12 Aug, 2013 6 commits
  2. 08 Aug, 2013 3 commits
  3. 07 Aug, 2013 6 commits
  4. 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
  5. 05 Aug, 2013 2 commits
  6. 04 Aug, 2013 1 commit
  7. 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
  8. 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
  9. 31 Jul, 2013 6 commits
    • Igor Babaev's avatar
      Fixed a wrong merge in prune_partitions() · 50741037
      Igor Babaev authored
      Added forgotten partition_explicit_prune from mysql-5.6.
      
      Backported the fix for
      Bug#13559657: PARTITION SELECTION DOES NOT WORK WITH VIEWS
      from mysql-5.6
      50741037
    • unknown's avatar
      Virtual column support for new innodb. · 94dfa010
      unknown authored
      94dfa010
    • Vladislav Vaintroub's avatar
      MDEV-4712 : Fix "shutdown" test. · a06a844d
      Vladislav Vaintroub authored
      There is a race condition during shutdown, that happens when "show status" runs during shutdown. 
      Functions show_slave_running(), show_slave_received_heartbeats(), show_heartbeat_period() would dereference NULL pointer master_info_index, after this variable is  set to NULL in slave_end() during shutdown.
      Fix introduces check for master_info_index == NULL in the affected functions.
      a06a844d
    • Sergey Vojtovich's avatar
      Merged fix for uninitialized variables. · 159866b6
      Sergey Vojtovich authored
      159866b6
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · e9f6c47f
      Sergey Vojtovich authored
      Fixed "check of testcases" failure.
      
      Value of INFORMATION_SCHEMA.PLUGINS.PLUGIN_TYPE_VERSION was
      pointing to incorrect address and could change after server
      restart.
      
      storage/innobase/handler/i_s.cc:
        Use proper plugin info pointer (struct st_mysql_information_schema
        instead of ST_FIELD_INFO[]).
      e9f6c47f
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 9dd68da1
      Sergey Vojtovich authored
      Fixed archive.archive non-debug failure.
      
      Applied revision:
      sergey.vojtovich@oracle.com-20111008171828-vje5pumzvl04rdbb
      
      Archive didn't read blobs from original table while
      performing REPAIR TABLE with non-debug builds.
      
      storage/archive/ha_archive.cc:
        Mark all columns for read independently of DBUG state.
        It instructs ::get_row_version2() to read all blobs.
      9dd68da1
  10. 30 Jul, 2013 5 commits
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · b183cda3
      Sergey Vojtovich authored
      Fixed sys_vars.log_error_func, sys_vars.log_error_func2,
      maria.small_blocksize, sys_vars.autocommit_func3, sys_vars.autocommit_func2,
      sys_vars.autocommit_func4, sys_vars.autocommit_func5,
      sys_vars.tx_isolation_func, main.pool_of_threads, innodb.innodb,
      archive.archive-big, parts.part_supported_sql_func_innodb,
      parts.partition_decimal_myisam, parts.partition_decimal_innodb,
      main.sum_distinct-big, percona.innodb_sys_index,
      percona.percona_flush_contiguous_neighbors failures.
      
      libmysqld/lib_sql.cc:
        Restore proper method to retrieve warnings number.
      b183cda3
    • Kentoku SHIBA's avatar
      fix for MDEV-4797 · ed2eb257
      Kentoku SHIBA authored
      ed2eb257
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · bdb7af8d
      Sergey Vojtovich authored
      Fixed parts.partition_alter1_1_2_innodb, parts.partition_alter1_2_innodb,
      parts.partition_alter2_1_1_innodb, parts.partition_alter2_1_2_innodb,
      parts.partition_alter2_2_1_innodb, parts.partition_alter2_2_2_innodb,
      parts.partition_alter4_innodb failures.
      
      mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      mysql-test/suite/parts/r/partition_alter4_innodb.result:
        Reverted some changes to test case as InnoDB doesn't support
        REPAIR TABLE and we didn't merge the following revision, which
        implements REPAIR TABLE for partitioning:
        mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
      bdb7af8d
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · bdbdbb82
      Sergey Vojtovich authored
      Fixed parts.partition_alter1_1_innodb failure.
      
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test:
        Applied hunk from 5.6 test: test takes long time, so only run it with
        the --big-test mtr-flag.
      bdbdbb82
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 9fff3f5b
      Sergey Vojtovich authored
      Fixed innodb.innodb_mysql failure.
      
      mysql-test/include/mix1.inc:
        Applied hunk from 5.6 test: error text has changed during merge.
      9fff3f5b