revision-id: cd9fe4b9586cd7fbc80394e48d93c5b5785ad80a (mariadb-10.1.35-82-gcd9fe4b9586) parent(s): cb02453ae5409c133fc4227899f25c44f4e8af99 49deadc737ceb03bf54002ad08e86d3002824c91 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-08 09:13:37 +0300 message: Merge branch 'bb-10.1-sysprg-16656' into bb-10.1-galera include/my_pthread.h | 2 +- .../suite/galera/t/galera_drop_database.test | 4 +- storage/innobase/include/ut0counter.h | 46 +++++++++++++--------- storage/xtradb/include/ut0counter.h | 46 +++++++++++++--------- 4 files changed, 58 insertions(+), 40 deletions(-)