1. 26 Jul, 2013 1 commit
    • 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
  2. 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
  3. 24 Jul, 2013 7 commits
  4. 23 Jul, 2013 4 commits
    • 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
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty → 10.0 · 84d07384
      Sergey Vojtovich authored
      Fixed test_sql_discovery compilation failure.
      
      storage/test_sql_discovery/mysql-test/archive/discover.rdiff:
        archive.discover result has changed during merge. Adjusted discover.rdiff
        accordingly.
      storage/test_sql_discovery/test_sql_discovery.cc:
        Adjusted test_sql_discovery according to:
        WL#4305 - storage-engine private data area per physical table.
      84d07384
    • Sergey Vojtovich's avatar
      MDEV-4786 - merge 10.0-monty → 10.0 · 6069e780
      Sergey Vojtovich authored
      Fixed sequence compilation failure.
      
      storage/sequence/sequence.cc:
        Adjusted sequence according to:
        WL#4305 - storage-engine private data area per physical table.
      6069e780
    • Sergey Vojtovich's avatar
      MDEV4786 - merge 10.0-monty → 10.0 · 43946c08
      Sergey Vojtovich authored
      sql/sql_table.cc:
        Removed false assertion that HA_NO_COPY_ON_ALTER is merge specific.
        This flag is used at least by Spider and Connect.
      storage/spider/ha_spider.cc:
        Renamed THD::stmt_da -> THD::get_stmt_da().
        Renamed KEY::key_parts -> KEY::user_defined_key_parts.
        Renamed ALTER_* flags -> Alter_info::ALTER_*.
      storage/spider/spd_conn.cc:
        Renamed THD::stmt_da -> THD::get_stmt_da().
      storage/spider/spd_db_conn.cc:
        Renamed MYSQL_ERROR -> Sql_condition.
        Renamed KEY::key_parts -> KEY::user_defined_key_parts.
      storage/spider/spd_db_include.h:
        current_comment_start argument of generate_parition_syntax()
        was removed during merge.
      storage/spider/spd_db_mysql.cc:
        Renamed KEY::key_parts -> KEY::user_defined_key_parts.
      storage/spider/spd_ping_table.cc:
        Renamed THD::stmt_da -> THD::get_stmt_da().
      storage/spider/spd_table.cc:
        Include my_getopt.h so that it exports my_defaults_file and
        my_defaults_extra_file.
        Renamed KEY::key_parts -> KEY::user_defined_key_parts.
      43946c08
  5. 21 Jul, 2013 3 commits
    • Sergei Golubchik's avatar
      more post-merge fixes: · 13dca012
      Sergei Golubchik authored
      * update results
      * don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables,
        (bad for CREATE ... LIKE) instead imply it in myisam/aria
      * restore HA_ERR_TABLE_DEF_CHANGED in archive
      * increase the default number of rwlock classes in P_S to fit all our rwlocks
      13dca012
    • Sergei Golubchik's avatar
      cosmetic fixes · d1fdb17b
      Sergei Golubchik authored
      d1fdb17b
    • Sergei Golubchik's avatar
      10.0-monty merge · b7b5f6f1
      Sergei Golubchik authored
      includes:
      * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
      * introduce LOCK_share, now LOCK_ha_data is strictly for engines
      * rea_create_table() always creates .par file (even in "frm-only" mode)
      * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
      b7b5f6f1
  6. 18 Jul, 2013 1 commit
  7. 17 Jul, 2013 2 commits
  8. 18 Jul, 2013 1 commit
  9. 17 Jul, 2013 3 commits
  10. 16 Jul, 2013 14 commits
  11. 15 Jul, 2013 1 commit