Vladislav Vaintroub
|
56c4cfe0be
|
MDEV-9293 - Use MariaDB's Connector/C in server
|
2016-08-25 16:27:57 +02:00 |
|
Vladislav Vaintroub
|
31a8cf54c8
|
Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
|
2016-08-19 15:46:27 +00:00 |
|
Vladislav Vaintroub
|
7b89b9f510
|
MDEV-9293 Connector/C integration
|
2016-08-19 15:27:37 +00: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 |
|
Sergei Golubchik
|
57dd1f6f3f
|
MDEV-6108 update userstat feature from percona server
TOTAL_SSL_CONNECTIONS columns in CLIENT_STATISTICS and USER_STATISTICS
|
2014-10-11 18:53:05 +02:00 |
|
Sergei Golubchik
|
43450fcc47
|
rename status_user.test -> userstat.test
|
2014-10-11 18:53:05 +02:00 |
|