delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-02-23	1	-0/+3
\|\
\| *	Merge branch '5.5' into 10.0	Sergei Golubchik	2016-02-15	1	-0/+3
\| \|\
\| \| *	dtrace in cmake	Sergei Golubchik	2016-02-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. ignore generated dtrace files 2. don't rewrite probes_mysql_nodtrace.h in-place
* \| \|	MDEV-7875 Duplicate maria_add_gis_sp script in the sources.	Alexey Botchkov	2016-01-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now both are generated by the cmake from the scripts/maria_add_gis_sp.sql.in
* \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2015-12-21	1	-26/+26
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'merge-tokudb-5.6' into 10.0	Sergei Golubchik	2015-12-15	1	-25/+26
\| \| \|
* \| \|	Ignore tokudb tool	Michael Widenius	2015-10-22	1	-0/+1
\| \| \|
* \| \|	MDEV-427/MDEV-5713 Add systemd script with notify functionality	Daniel Black	2015-10-12	1	-0/+1
\|/ /
* \|	Merge 'https://github.com/Buggynours/MariaDB 10.0' into 10.0	Sergei Golubchik	2015-08-03	1	-0/+4
\|\ \
\| * \|	Fix loosing result lines when all of this is true:	Olivier Bertrand	2015-07-06	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The table type is MYSQL The query where clause includes an indexed column The where clause contains < or <= operator on this column Change version date modified: storage/connect/ha_connect.cc modified: storage/connect/tabmysql.cpp Add visual studio 2013 files to ignore modified: .gitignore
* \| \|	Merge branch 'connect-10.0' into 10.0	Sergei Golubchik	2015-06-16	1	-0/+3
\|\ \ \ \| \|/ /
\| * \|	Commit merge resolved files	Olivier Bertrand	2015-06-05	1	-18/+4
\| \|\ \
\| * \| \|	Make BIN table files more flexible with new column format.	Olivier Bertrand	2015-05-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular enable to set length and endian setting. This should solve all problems on IBM390s machines. modified: storage/connect/ha_connect.cc modified: storage/connect/tabfix.cpp modified: storage/connect/tabfix.h Make DBF tables to be usable in big-endian machines (test version) modified: storage/connect/filamdbf.cpp Ignore git files on storage/connect modified: .gitignore
\| * \| \|	Typo to check buildbot	Olivier Bertrand	2015-05-10	1	-0/+5
\| \| \| \|
* \| \| \|	Merge branch '5.5' into 10.0	Sergei Golubchik	2015-06-11	1	-2/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	Merge tag 'tokudb-engine/tokudb-7.5.7' into 5.5	Sergei Golubchik	2015-06-03	1	-0/+1
\| \|\ \
\| \| * \|	Add local cache option to make.mysql.debug.env.bash	Yoni Fogel	2013-05-29	1	-0/+1
\| \| \| \|
\| \| * \|	Import .gitignore	Yoni Fogel	2013-04-17	1	-0/+28
\| \| /
* \| \|	perfschema 5.6.24	Sergei Golubchik	2015-05-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including the big commit commit 305130361bf72726de220f3d2b2787395e10be61 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Feb 10 11:31:32 2015 +0100 WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6 (with the following commits) and related changes in sql/
* \| \|	.gitignore: add generated mroonga *.result files	Sergei Golubchik	2015-05-05	1	-16/+2
\| \|/ \|/\| \| \| \| \|	and remove duplicates
* \|	- Adding files to ignore from C C++ and Visual Studio	Olivier Bertrand	2015-03-16	1	-0/+233
\|/ \| \| \|	- Making result files to be ended by LF to avoid test failures
*	Fix the tree to work in git. Backport corresponing 10.1 changes.	Sergei Golubchik	2015-02-10	1	-0/+232