Marko Mäkelä
3b25083785
Merge 10.4 into 10.5
2020-03-23 10:50:14 +02:00
Sergey Vojtovich
81f700015e
Cleanup my_atomic.h includes
...
my_atomic.h is included indirectly anyways.
2020-03-21 20:11:44 +04:00
Sergei Golubchik
0ea717f51a
P_S 5.7.28
2020-03-10 19:24:22 +01:00
Marko Mäkelä
a983b24407
Merge 10.4 into 10.5
2020-01-28 14:17:09 +02:00
Oleksandr Byelkin
6918157e98
Merge branch '10.3' into 10.4
2020-01-21 23:15:02 +01:00
Oleksandr Byelkin
ade89fc898
Merge branch '10.2' into 10.3
2020-01-21 09:11:14 +01:00
Oleksandr Byelkin
3a1716a7e7
Merge branch '10.1' into 10.2
2020-01-20 16:15:05 +01:00
Oleksandr Byelkin
10eacd5ff7
Merge branch 'merge-perfschema-5.6' into 10.1
2020-01-19 13:11:45 +01:00
Oleksandr Byelkin
3aff3f3679
5.6.47
2020-01-19 12:52:07 +01:00
Marko Mäkelä
624dd71b94
Merge 10.4 into 10.5
2019-08-13 18:57:00 +03:00
Eugene Kosov
c9aa495fb6
MDEV-19955 make argument of handler::ha_write_row() const
...
MDEV-19486 and one more similar bug appeared because handler::write_row() interface
welcomes to modify buffer by storage engine. But callers are not ready for that
thus bugs are possible in future.
handler::write_row():
handler::ha_write_row(): make argument const
2019-07-05 13:14:19 +03:00
Robert Bindar
bf70430ead
MDEV-17709 Remove handlerton::state
2019-06-06 22:09:31 +04:00
Marko Mäkelä
be85d3e61b
Merge 10.2 into 10.3
2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130
Merge 10.1 into 10.2
2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
f177f125d4
Merge branch '5.5' into 10.1
2019-05-11 19:15:57 +03:00
Vicențiu Ciorbaru
15f1e03d46
Follow-up to changing FSF address
...
Some places didn't match the previous rules, making the Floor
address wrong.
Additional sed rules:
sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g'
sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'
2019-05-11 18:30:45 +03:00
Sergei Golubchik
c9717dc019
Merge branch '10.2' into 10.3
2018-05-11 13:15:10 +02:00
Sergei Golubchik
9b1824dcd2
Merge branch '10.1' into 10.2
2018-05-10 13:01:42 +02:00
Sergei Golubchik
9989c26bc9
Merge branch '10.0' into 10.1
2018-05-05 14:01:59 +02:00
Sergei Golubchik
584137879f
Merge branch 'merge-perfschema-5.6' into 10.0
2018-04-26 14:12:13 +02:00
Marko Mäkelä
1e3886ae80
Merge bb-10.2-ext into 10.3
2017-06-19 17:28:08 +03:00
Alexander Barkov
765347384a
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-06-15 15:27:11 +04:00
Marko Mäkelä
8f643e2063
Merge 10.1 into 10.2
2017-05-23 11:09:47 +03:00
Marko Mäkelä
65e1399e64
Merge 10.0 into 10.1
...
Significantly reduce the amount of InnoDB, XtraDB and Mariabackup
code changes by defining pfs_os_file_t as something that is
transparently compatible with os_file_t.
2017-05-20 08:41:20 +03:00
Vicențiu Ciorbaru
c1b3aaa24e
Update perfschema version to 5.6.36 post-merge
2017-05-16 14:28:19 +03:00
Alexander Barkov
7ba0cfc8ae
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
2017-04-19 05:21:36 +04:00
Michael Widenius
a05a610d60
Added "const" to new data for handler::update_row()
...
This was done to make it clear that a update_row() should not change the
row.
This was not done for handler::write_row() as this function still needs
to update auto_increment values in the row. This should at some point
be moved to handler::ha_write_row() after which write_row can also have
const arguments.
2017-04-18 12:23:53 +03:00
Alexander Barkov
86209c7304
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
2016-12-30 15:43:08 +04:00
Sergei Golubchik
4a5d25c338
Merge branch '10.1' into 10.2
2016-12-29 13:23:18 +01:00
Sergey Vojtovich
8ff3b892ae
MDEV-11212 - Clean-up MariaDB atomic operations
...
Removed MY_ATOMIC_MODE_DUMMY and WITH_ATOMIC_OPS: MariaDB is not functional
without atomic operations anymore.
2016-12-13 16:38:20 +04:00
Sergei Golubchik
66d9696596
Merge branch '10.0' into 10.1
2016-09-28 17:55:28 +02:00
Sergei Golubchik
2e914acb78
Merge branch 'merge/merge-perfschema-5.6' into 10.0
2016-09-27 19:00:08 +02:00
Sergei Golubchik
f9bdc7c01a
Merge branch '10.2' into bb-10.2-jan
2016-09-19 09:47:08 +02:00
Sergei Golubchik
d019af402c
misc after-merge changes:
...
* 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
2016-09-10 16:04:44 +02:00
Sergei Golubchik
6b1863b830
Merge branch '10.0' into 10.1
2016-08-25 12:40:09 +02:00
Sergei Golubchik
e672d3fb32
Merge branch 'merge/merge-perfschema-5.6' into 10.0
...
5.6.32
2016-08-10 19:44:28 +02:00
Sergei Golubchik
a5679af1b1
Merge branch '10.0' into 10.1
2016-02-23 21:35:05 +01:00
Sergei Golubchik
b6bcd0fc92
Merge branch 'merge-perfschema-5.6' into 10.0
2016-02-16 19:15:55 +01:00
Sergei Golubchik
dfb74dea30
Merge branch '10.0' into 10.1
2015-10-12 00:37:58 +02:00
Sergei Golubchik
2ca4141af1
Merge branch 'merge-perfschema-5.6' into 10.0
2015-10-09 18:24:17 +02:00
Sergei Golubchik
530a6e7481
Merge branch '10.0' into 10.1
...
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
2015-09-03 12:58:41 +02:00
Sergei Golubchik
0a99293db3
Merge branch 'merge-perfschema-5.6' into 10.0
...
5.6.26
2015-08-03 16:34:59 +02:00
Sergei Golubchik
658992699b
Merge tag 'mariadb-10.0.20' into 10.1
2015-06-27 20:35:26 +02:00
Sergei Golubchik
ede08808e9
Merge branch 'merge-perfschema-5.6' into 10.0
2015-06-16 12:47:58 +02:00
Sergei Golubchik
f62c12b405
Merge 10.0.14 into 10.1
2014-10-15 12:59:13 +02:00
Sergey Vojtovich
f1c1c04a34
MDEV-4262 - P_S discovery
...
Discover P_S tables automatically.
Most of this patch is code clean-up:
- removed tests and code responsible for P_S tables correctness verification
- always return error from ha_perfschema::create()
- install/upgrade scripts won't create P_S tables anymore
2014-08-19 15:18:18 +04:00
Sergei Golubchik
098a9c602d
perfschema 5.6.20
2014-08-06 19:41:33 +02:00
Sergei Golubchik
dc9b2a95bf
MDEV-6249 mark P_S STABLE and disable it by default
2014-06-09 20:00:23 +02:00
Sergei Golubchik
5ffe939a6c
perfschema 5.6.17
2014-05-07 16:12:16 +02:00
Sergei Golubchik
04bce7b569
5.6.17
2014-05-07 10:04:30 +02:00
