mariadb/libmysqld
Monty fbab79c9b8 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
	cmake/make_dist.cmake.in
	mysql-test/r/func_json.result
	mysql-test/r/ps.result
	mysql-test/t/func_json.test
	mysql-test/t/ps.test
	sql/item_cmpfunc.h
2018-01-01 19:39:59 +02:00
..
examples Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG 2014-10-13 09:52:28 +02:00
client_settings.h remove libmysql/ 2016-09-12 17:51:49 +02:00
CMakeLists.txt Merge 10.2 into bb-10.2-ext 2017-09-20 17:47:49 +03:00
emb_qcache.cc Use sql_mode_t for sql_mode. 2016-10-05 01:11:08 +03:00
emb_qcache.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
embedded_priv.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
lib_sql.cc Merge branch '10.2' into bb-10.2-ext 2017-08-25 10:25:48 +02:00
libmysql.c MDEV-13384 - misc Windows warnings fixed 2017-09-28 17:20:46 +00:00
libmysqld.c Merge remote-tracking branch 'origin/10.1' into 10.2 2017-12-22 12:23:39 +02:00
libmysqld.def merge with 5.3 2011-10-19 21:45:18 +02:00
libmysqld.rc
resource.h