revision-id: 448c35a4c57b1739d72f28fa3412bed0011b60ac (mariadb-galera-10.0.37-4-g448c35a4c57) parent(s): 944dbb5fd9f5759fe8602fe2179777a93d90a69e 074d51e6151377928864f34b3d8f798b7e8c23d9 author: Jan Lindström committer: Jan Lindström timestamp: 2019-02-01 11:16:31 +0200 message: Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera cmake/wsrep.cmake | 4 ++-- mysql-test/r/information_schema.result | 4 +--- mysql-test/r/show_check.result | 6 +++--- mysql-test/suite/funcs_1/r/is_columns_is.result | 16 ++++++++-------- 4 files changed, 14 insertions(+), 16 deletions(-)