1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Commit Graph

6 Commits

Author SHA1 Message Date
Sergei Petrunia
b2617cae3f Post-merge fix: fix compilation 2017-07-29 17:24:10 +03:00
Sergei Petrunia
f2952485a1 Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished.
It compiles on Linux but fails a lot of tests still
2017-07-29 10:06:09 +00:00
Sergei Petrunia
5e47d08eb6 Merge 'merge-myrocks' into 'bb-10.2-mariarocks'
Merged cset:
    Copy of

    commit d1bb19b8f751875472211312c8e810143a7ba4b6
    Author: Manuel Ung <mung@fb.com>
    Date:   Fri Feb 3 11:50:34 2017 -0800
    ...

        Add cardinality stats to information schema
2017-02-19 16:29:01 +00:00
Sergei Petrunia
01a5216b9c MariaRocks port: temporarily? disable Per-table Extra Stats
(why are table reads/writes/updates collected in ha_statistics?
this structure was intended for table statistics that the engine
reports.. and now it is also used for engine-agnostic statistics
like rows_read, rows_requested, etc?)
2016-10-15 20:58:15 +00:00
Sergei Petrunia
50f323683a Add a temporary stand-in for abort_with_stack_traces() call 2016-10-09 17:20:11 +00:00
Sergei Petrunia
84dd64702a Fix compilation failure in rdb_perf_context.h
Rdb_atomic_perf_counters uses my_io_perf_atomic_struct
which uses atomic_stat from include/atomic_stat.h
which was backported in the previous cset.
2016-10-09 16:02:13 +00:00