1. 14 Sep, 2016 3 commits
  2. 13 Sep, 2016 5 commits
  3. 11 Sep, 2016 2 commits
  4. 10 Sep, 2016 1 commit
    • Sergei Golubchik's avatar
      misc after-merge changes: · d019af40
      Sergei Golubchik authored
      * remove new InnoDB-specific ER_ and HA_ERR_ codes
      * renamed few old ER_ and HA_ERR_ error messages to be less MyISAM-specific
      * remove duplicate enum definitions (durability_properties, icp_result)
      * move new mysql-test include files to their owner suite
      * rename xtradb.rdiff files to *-disabled
      * remove mistakenly committed helper perl module
      * remove long obsolete handler::ha_statistic_increment() method
      * restore the standard C xid_t structure to not have setters and getters
      * remove xid_t::reset that was cleaning too much
      * move MySQL-5.7 ER_ codes where they belong
      * fir innodb to include service_wsrep.h not internal wsrep headers
      * update tests and results
      d019af40
  5. 09 Sep, 2016 2 commits
  6. 08 Sep, 2016 2 commits
    • Sergei Golubchik's avatar
      MDEV-10551 Test innodb.defrag_mdl-9155 hangs on InnoDB 5.7 · 11ae60d2
      Sergei Golubchik authored
      restore a table_flag lost in a merge
      11ae60d2
    • Jan Lindström's avatar
      Merge InnoDB 5.7 from mysql-5.7.14. · fec844ac
      Jan Lindström authored
      Contains also:
             MDEV-10549 mysqld: sql/handler.cc:2692: int handler::ha_index_first(uchar*): Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed. (branch bb-10.2-jan)
             Unlike MySQL, InnoDB still uses THR_LOCK in MariaDB
      
             MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
             enable tests that were fixed in MDEV-10549
      
             MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
             fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables
      fec844ac
  7. 02 Sep, 2016 1 commit
    • Jan Lindström's avatar
      Merge InnoDB 5.7 from mysql-5.7.9. · 2e814d47
      Jan Lindström authored
      Contains also
      
      MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7
      
      	The failure happened because 5.7 has changed the signature of
      	the bool handler::primary_key_is_clustered() const
      	virtual function ("const" was added). InnoDB was using the old
      	signature which caused the function not to be used.
      
      MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7
      
      	Fixed mutexing problem on lock_trx_handle_wait. Note that
      	rpl_parallel and rpl_optimistic_parallel tests still
      	fail.
      
      MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
        Reason: incorrect merge
      
      MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
        Reason: incorrect merge
      2e814d47
  8. 04 Jul, 2016 2 commits
  9. 03 Jul, 2016 1 commit
    • Alexander Barkov's avatar
      Removing duplicate code in double-to-longlong conversion. · 59ec3973
      Alexander Barkov authored
      Adding Converter_double_to_longlong and reusing it in:
      1. Field_longlong::store(double nr)
      2. Field_double::val_int()
      3. Item::val_int_from_real()
      4. Item_dyncol_get::val_int()
      As a good side efferct, now overflow in conversion in the mentioned
      val_xxx() methods return exactly the same warning.
      59ec3973
  10. 02 Jul, 2016 4 commits
  11. 01 Jul, 2016 6 commits
  12. 30 Jun, 2016 11 commits