Alexander Barkov
4156b1a260
MDEV-19772 Add helper classes for ST_FIELD_INFO
2019-06-16 19:03:47 +04:00
Oleksandr Byelkin
c07325f932
Merge branch '10.3' into 10.4
2019-05-19 20:55:37 +02:00
Marko Mäkelä
be85d3e61b
Merge 10.2 into 10.3
2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130
Merge 10.1 into 10.2
2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
cb248f8806
Merge branch '5.5' into 10.1
2019-05-11 22:19:05 +03:00
Brave Galera Crew
36a2a185fe
Galera4
2019-01-23 15:30:00 +04:00
Michael Widenius
4aaa38d26e
Enusure that my_global.h is included first
...
- Added sql/mariadb.h file that should be included first by files in sql
directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h
2017-08-24 01:05:44 +02:00
Sergei Golubchik
da4d71d10d
Merge branch '10.1' into 10.2
2017-03-30 12:48:42 +02:00
iangilfillan
f0ec34002a
Correct FSF address
2017-03-10 18:21:29 +01:00
Sergei Golubchik
06b7fce9f2
Merge branch '10.1' into 10.2
2016-09-09 08:33:08 +02:00
Sergei Golubchik
61fd38a1de
update plugin maturities
2016-09-05 17:11:14 +02:00
Galina Shalygina
be1d06c8a5
Merge branch '10.2' into 10.2-mdev9864
2016-05-08 23:04:41 +03:00
Sergei Golubchik
3fdc6140a3
update plugins' maturity levels
2016-03-18 22:05:23 +01:00
Nirbhay Choubey
03e0f1f866
MDEV-7053 : WSREP_STATUS & WSREP_MEMBERSHIP I_S tables
...
Addendum : Renamed plugin .so file.
2014-12-23 18:36:33 -05:00
Sergei Golubchik
853077ad7e
Merge branch '10.0' into bb-10.1-merge
...
Conflicts:
.bzrignore
VERSION
cmake/plugin.cmake
debian/dist/Debian/control
debian/dist/Ubuntu/control
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/null.result
mysql-test/r/old-mode.result
mysql-test/r/union.result
mysql-test/t/join_outer.test
mysql-test/t/null.test
mysql-test/t/old-mode.test
mysql-test/t/union.test
packaging/rpm-oel/mysql.spec.in
scripts/mysql_config.sh
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_cond.cc
sql/item_cmpfunc.h
sql/lock.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_update.cc
sql/sql_yacc.yy
storage/innobase/buf/buf0flu.cc
storage/innobase/fil/fil0fil.cc
storage/innobase/include/srv0srv.h
storage/innobase/lock/lock0lock.cc
storage/tokudb/CMakeLists.txt
storage/xtradb/buf/buf0flu.cc
storage/xtradb/fil/fil0fil.cc
storage/xtradb/include/srv0srv.h
storage/xtradb/lock/lock0lock.cc
support-files/mysql.spec.sh
2014-12-02 22:25:16 +01:00
Nirbhay Choubey
369c02674c
MDEV-7053: WSREP_STATUS & WSREP_MEMBERSHIP I_S tables
...
wsrep_info INFORMATION_SCHEMA plugin to provide WSREP_STATUS
and WSREP_MEMBERSHIP tables.
2014-11-22 14:33:51 -05:00
