1. 05 Aug, 2013 2 commits
  2. 04 Aug, 2013 1 commit
  3. 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
  4. 01 Aug, 2013 5 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
    • 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
  5. 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
  6. 30 Jul, 2013 4 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
    • 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
  7. 29 Jul, 2013 1 commit
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 0f985c64
      Sergey Vojtovich authored
      Fixed archive.archive failure.
      
      Applied remnants of two revisions, which were partially merged.
      
      Rev. 3225.1.1 (5.0 compatibility):
      
        BUG#11756687 - 48633: ARCHIVE TABLES ARE NOT UPGRADEABLE
      
        Archive table created by 5.0 were not accessible.
      
        This patch adds various fixes so that 5.0 archive tables
        are readable and writable. Though it is strongly recommended
        to avoid binary upgrade of archive tables whenever it is
        possible.
      
      Rev. 3710 (due to valgrind warnings):
      
        Bug#13907676: HA_ARCHIVE::INFO
        In WL#4305 the refactoring of the archive writer,
        it could flush the writer when it was not yet open.
      
        This was due to if bulk insert was used but no
        rows was actually inserted (write_row was never called),
        the writer was marked dirty even if it was not open.
      
        Fix was to only mark it as dirty if it was opened.
      
      mysql-test/std_data/bug48633.ARM:
        A test case for BUG#11756687: archive table created by 5.0.95.
      mysql-test/std_data/bug48633.ARZ:
        A test case for BUG#11756687: archive table created by 5.0.95.
      mysql-test/std_data/bug48633.frm:
        A test case for BUG#11756687: archive table created by 5.0.95.
      mysql-test/suite/archive/archive.result:
        Modified a test case for BUG#47012 according to fix for
        BUG#11756687.
        Added a test case for BUG#11756687.
      mysql-test/suite/archive/archive.test:
        Modified a test case for BUG#47012 according to fix for
        BUG#11756687.
        Added a test case for BUG#11756687.
        
        No need to remove .ARM files anymore: DROP TABLE will take
        care of them.
      storage/archive/azio.c:
        Do not write AZIO (v.3) header to GZIO file (v.1).
        
        Added initialization of various azio_stream members
        to read_header() so it can proceed with v.1 format.
        
        Update data start position only when reading first
        GZIO header. That is only on azopen(), but never on
        azread().
      storage/archive/ha_archive.cc:
        Removed guardians that were rejecting to open v.1 archive
        tables.
        
        Reload .frm when repairing v.1 tables - they didn't have
        storage for .frm.
        
        Do not flush write stream when it is not open.
        
        Let DROP TABLE remove 5.0 .ARM files.
      0f985c64
  8. 27 Jul, 2013 2 commits
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 5f8effe1
      Sergey Vojtovich authored
      Fixed debian/ubuntu build failure.
      
      cmake/ssl.cmake:
        Do not prefer static SSL libraries for WITH_SSL=system|yes as there is
        no guarantee that they will link well with MariaDB shared objects.
        Specifically on debian/ubuntu static SSL libraries are built without
        -fPIC.
        
        Restore 5.6 behavior. 10.0.3 never prefer static SSL libraries.
      5f8effe1
    • Igor Babaev's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · b07d0e2a
      Igor Babaev authored
      Fixed failure of one of the test case from innodb_ext_key.test.
      The fact is that the innodb code may return statistical data
      on record per key values that is far off the real numbers. 
      This is exactly what happened in mariadb-5.5 with this test case.
      
      Added an ANALYZE command in this test case to avoid this problem.
      The same change will be done in mariadb-5.5
      b07d0e2a
  9. 26 Jul, 2013 4 commits
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · b3a1f420
      Sergey Vojtovich authored
      Fixed connect.grant failure.
      
      sql/create_options.cc:
        Keep "first" list intact, allocate new list for merge result.
        
        Normally "first" is options list on TABLE_SHARE. ALTER TABLE may fail
        after the merge and leave share with corrupt list in the table definition
        cache.
      sql/create_options.h:
        Construct engine_option_value from another engine_option_value.
      b3a1f420
    • Alexey Botchkov's avatar
      main.gis test fixed. · 62feb0c5
      Alexey Botchkov authored
      62feb0c5
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · b385fdc6
      Sergey Vojtovich authored
      Fixed maria.maria and funcs_1.is_tables failure.
      
      sql/sql_table.cc:
        C_ALTER_TABLE_FRM_ONLY lost it's meaning after merge of inplace alter:
        now it is used even if table is to be copied.
        Otherwise: how can row format change go without notifying storage engine?
        Removed check for create_table_mode for now, to be discussed.
      b385fdc6
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 5845b83d
      Sergey Vojtovich authored
      Fixed query_response_time build failure.
      
      plugin/query_response_time/query_response_time.cc:
        my_atomic_rwlock_rdlock() may update time_collector_lock structure.
        Remove const modifier from relevant methods.
      5845b83d
  10. 25 Jul, 2013 3 commits
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · e084a2b0
      Sergey Vojtovich authored
      Fixed debian/ubuntu packages build failure.
      
      debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch:
        tmp_user has now extra column, updated patch accordingly.
      e084a2b0
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · e33e9825
      Sergey Vojtovich authored
      Fixed main.innodb_mysql_sync failure.
      
      TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE is not same as
      TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE. Comment in sql_table.cc says:
      
            Storage engine has requested exclusive lock only for prepare phase
            and we are not under LOCK TABLES.
            Don't mark TABLE_SHARE as old in this case, as this won't allow opening
            of table by other threads during main phase of in-place ALTER TABLE.
      
      At this moment we hold exclusive metadata lock, all we should do
      is purge unused TABLE objects.
      
      sql/sql_base.cc:
        Restore 5.6 behavior of TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE.
      sql/sql_base.h:
        Restore 5.6 behavior of TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE.
      e33e9825
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty - 10.0 · 9388822c
      Sergey Vojtovich authored
      Fixed main.mysql--help failure.
      
      mysql-test/r/mysqld--help.result:
        PFS_MAX_RWLOCK_CLASS was raised to 40 during the merge.
      9388822c
  11. 24 Jul, 2013 7 commits
  12. 23 Jul, 2013 1 commit
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty → 10.0 · b2aea91f
      Sergey Vojtovich authored
      Fixed connect compilation failure.
      
      storage/connect/csort.cpp:
        min/max are not defined by my_global.h anymore, include osutil.h instead.
      storage/connect/filamfix.cpp:
        min/max are not defined by my_global.h anymore, include osutil.h instead.
      storage/connect/ha_connect.cc:
        Renamed MYSQL_ERROR -> Sql_condition.
        Renamed KEY::key_parts -> KEY::user_defined_key_parts.
        Adjusted connect according to:
        WL#4305 - storage-engine private data area per physical table.
      storage/connect/ha_connect.h:
        Adjusted connect according to:
        WL#4305 - storage-engine private data area per physical table.
      storage/connect/inihandl.c:
        min/max are not defined by my_global.h anymore, include osutil.h instead.
      storage/connect/osutil.h:
        min/max are not defined by my_global.h anymore, define them for C as well.
      storage/connect/taboccur.cpp:
        Include server headers before osutil.h to avoid min/max redefinition.
      storage/connect/tabpivot.cpp:
        Include server headers before osutil.h to avoid min/max redefinition.
      storage/connect/tabtbl.cpp:
        Include server headers before osutil.h to avoid min/max redefinition.
      storage/connect/tabxcl.cpp:
        Include server headers before osutil.h to avoid min/max redefinition.
      storage/connect/value.cpp:
        min/max are not defined by my_global.h anymore, include osutil.h instead.
        Include server headers before osutil.h to avoid min/max redefinition.
      b2aea91f