mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
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
..
async_example.c MWL#192: non-blocking client API, after-review fixes. 2012-01-06 12:43:18 +01:00
client_priv.h cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02:00
CMakeLists.txt MDEV-5620 CMake option to compile against an external PCRE library 2014-03-04 01:22:53 +01:00
completion_hash.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
completion_hash.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
echo.c Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
get_password.c mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
my_readline.h MDEV-4297 mysql --binary-mode 2013-06-10 21:45:30 +02:00
mysql.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
mysql_plugin.c MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
mysql_upgrade.c Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
mysqladmin.cc Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
mysqlbinlog.cc 10.0-base merge 2014-02-03 15:22:39 +01:00
mysqlcheck.c Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
mysqldump.c Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
mysqlimport.c fix main.mysqldump test failing after Mroonga merge. 2014-10-05 22:07:19 +02:00
mysqlshow.c 10.0-base merge 2014-02-03 15:22:39 +01:00
mysqlslap.c MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
mysqltest.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
readline.cc MDEV-4297 mysql --binary-mode 2013-06-10 21:45:30 +02:00
sql_string.cc.dontuse mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
sql_string.h.dontuse mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00