[Commits] d2352eb3bc4: Merge branch 'bb-10.2-marko' of github.com:MariaDB/server into bb-10.2-marko

jan jan.lindstrom at mariadb.com
Thu Mar 23 14:22:15 EET 2017


revision-id: d2352eb3bc4a67f1e7fe0b0575187e4e459fbb35 (mariadb-10.2.4-76-gd2352eb3bc4)
parent(s): 2d96d13ecdcab4ce16c0d8976753d8aa50137e17 130346ce3593d77c86efcc88a02e33c9aed3bdab
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-03-23 14:22:13 +0200
message:

Merge branch 'bb-10.2-marko' of github.com:MariaDB/server into bb-10.2-marko


 mysql-test/r/func_json.result     | 11 +++++++++++
 mysql-test/t/func_json.test       | 11 +++++++++++
 sql/item_jsonfunc.cc              |  2 ++
 sql/share/errmsg-utf8.txt         |  2 ++
 sql/signal_handler.cc             |  3 +++
 sql/sql_class.cc                  |  2 ++
 sql/sql_class.h                   | 18 ++++++++++++------
 sql/sql_repl.cc                   | 12 ++++++++++--
 storage/innobase/fil/fil0fil.cc   |  2 +-
 storage/innobase/include/ut0dbg.h |  2 +-
 10 files changed, 55 insertions(+), 10 deletions(-)


More information about the commits mailing list