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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'merge-tokudb-5.6' into 10.0	Vicențiu Ciorbaru	2017-05-16	34	-187/+1816
\|\
\| *	5.6.36-82.0	Vicențiu Ciorbaru	2017-05-16	35	-190/+1817
* \|	Update perfschema version to 5.6.36 post-merge	Vicențiu Ciorbaru	2017-05-16	1	-1/+1
* \|	Merge remote-tracking branch 'connect/10.0' into 10.0	Vicențiu Ciorbaru	2017-05-16	102	-4083/+3563
\|\ \
\| * \|	MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos (ha_connect.cc)	Olivier Bertrand	2017-05-12	1	-1/+1
\| * \|	Fix failing test connect.json for MariaDB 10.0	Olivier Bertrand	2017-05-12	4	-14/+8
\| * \|	Fix wrong value of JSON column	Olivier Bertrand	2017-05-11	99	-3413/+2406
\| * \|	Fix MDEV-12603 Insert replaces values in ZIP file	Olivier Bertrand	2017-05-06	4	-21/+80
\| * \|	Fix MDEV-12653 Cannot add index for ZIP CONNECT table	Olivier Bertrand	2017-05-04	6	-11/+19
\| * \|	Disable json tests	Olivier Bertrand	2017-05-03	1	-2/+2
\| * \|	Fix MDEV-12587 MariaDB CONNECT DIR Type	Olivier Bertrand	2017-05-03	9	-50/+82
\| * \|	Fix MDEV-12631 valgrind warning for zipped tables	Olivier Bertrand	2017-04-29	1	-4/+10
\| * \|	Fix MDEV-12520: Decimal values can be truncated for JDBC tables	Olivier Bertrand	2017-04-22	2	-2/+4
\| * \|	Fix crash when a line is not ended by \n.	Olivier Bertrand	2017-03-28	5	-27/+64
\| * \|	Fix MDEV-12220: Crash when doing UPDATE or DELETE on an external	Olivier Bertrand	2017-03-18	3	-12/+37
\| * \|	Commit the 2 last commits merged from 10.1	Olivier Bertrand	2017-03-11	5	-291/+455
\| * \|	Fix MDEV-12142 crash when creating CSV table	Olivier Bertrand	2017-03-06	38	-1508/+1670
* \| \|	Merge branch 'merge-perfschema-5.6' into 10.0	Vicențiu Ciorbaru	2017-05-16	16	-39/+108
\|\ \ \
\| * \| \|	5.6.36	Vicențiu Ciorbaru	2017-05-16	16	-39/+108
* \| \| \|	MDEV-10936 CONNECT engine JDBC type can't find JdbcInterface	Sergei Golubchik	2017-05-15	1	-1/+1
* \| \| \|	MDEV-12660 inconsistent mysql_stmt_close	Sergei Golubchik	2017-05-15	1	-2/+1
* \| \| \|	MDEV-11883 MariaDB crashes with out-of-memory when query information_schema	Sergei Golubchik	2017-05-15	3	-6/+58
* \| \| \|	MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning	Sergei Golubchik	2017-05-15	14	-37/+23
* \| \| \|	MDEV-12761 Error return from external_lock make the server crash	Sergei Golubchik	2017-05-15	5	-12/+38
* \| \| \|	MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segf...	Sergei Golubchik	2017-05-15	10	-46/+24
* \| \| \|	WIP: global readonly variable pcre_frame_size	Daniel Black	2017-05-15	7	-1/+33
* \| \| \|	MDEV-12420: pcre recursion overflow test case	Daniel Black	2017-05-15	2	-0/+9
* \| \| \|	MDEV-12420: add full list of pcre error messages	Daniel Black	2017-05-15	1	-0/+62
* \| \| \|	MDEV-12420: PCRE stack overflow	Daniel Black	2017-05-15	2	-3/+7
* \| \| \|	MDEV-12188 information schema - errors populating fail to free memory, unlock...	Marko Mäkelä	2017-05-15	2	-286/+284
* \| \| \|	Fix the Solaris compilation after MDEV-12674	Marko Mäkelä	2017-05-15	2	-2/+16
* \| \| \|	MDEV-12674 Innodb_row_lock_current_waits has overflow	Marko Mäkelä	2017-05-12	12	-233/+214
* \| \| \|	Merge branch '5.5' into 10.0	Sergei Golubchik	2017-05-08	4	-6/+89
\|\ \ \ \
\| * \| \| \|	Fixed the bug mdev-12673.	Igor Babaev	2017-05-04	3	-5/+88
\| * \| \| \|	bump the VERSION	Daniel Bartholomew	2017-05-02	1	-1/+1
\| * \| \| \|	mysqld_safe_help - remove warningmariadb-5.5.56	Daniel Black	2017-04-30	1	-1/+1
* \| \| \| \|	MDEV-10104 Table lock race condition with replication	Monty	2017-05-05	1	-13/+46
* \| \| \| \|	Fixed some bugs in fork_big.pl which caused some tests to die early	Monty	2017-05-05	1	-11/+25
* \| \| \| \|	MDEV-12635 innodb.log_file_size fails when run with Valgrind	Marko Mäkelä	2017-05-05	2	-0/+4
* \| \| \| \|	restore dependencies, removed in f2dc04abea	Sergei Golubchik	2017-05-03	1	-1/+3
* \| \| \| \|	Merge branch '5.5' into bb-10.0-merge-5.5bb-10.0-merge-5.5	Oleksandr Byelkin	2017-04-25	3	-6/+50
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fixed the bug mdev-10693.	Igor Babaev	2017-04-24	3	-6/+51
* \| \| \| \|	Add and adjust a test from MySQL:	Marko Mäkelä	2017-04-24	2	-0/+175
* \| \| \| \|	Add and adjust a test from MySQL:	Marko Mäkelä	2017-04-24	3	-0/+98
* \| \| \| \|	MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL U...	Alexander Barkov	2017-04-22	3	-1/+30
* \| \| \| \|	Fixed bug mdev-10053.	Igor Babaev	2017-04-21	6	-12/+101
* \| \| \| \|	fix "cmake -DWITH_PCRE=bundled"	Sergei Golubchik	2017-04-21	1	-1/+1
* \| \| \| \|	Merge branch '5.5' into 10.0	Sergei Golubchik	2017-04-21	57	-173/+670
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	respect client's desire to force ssl even when WITH_SSL=NO	Sergei Golubchik	2017-04-20	1	-2/+2
\| * \| \| \|	MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_key�...	Sergei Golubchik	2017-04-20	7	-17/+61