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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge with MySQL 5.1.42	Michael Widenius	2010-01-15	1	-1/+1
\|\
\| *	Bug #48985: show create table crashes if previous access to the table	Georgi Kodinov	2009-12-15	1	-1/+1
* \|	Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.	unknown	2009-11-30	1	-30/+132
\|\ \
\| * \	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-30/+134
\| \|\ \ \| \| \|/
\| \| *	Bug #40877: multi statement execution fails in 5.1.30	Georgi Kodinov	2009-10-16	1	-6/+6
\| \| *	Merge of Bug#35996	Martin Hansson	2009-09-30	1	-1/+1
\| \| \|\
\| \| \| *	merging	Alexey Botchkov	2009-09-29	1	-47/+26
\| \| \| \|\
\| \| \| * \|	Bug#43733 Select on processlist let the embedded server crash (concurren...	Alexey Botchkov	2009-06-04	1	-1/+1
\| \| * \| \|	Bug#35996: SELECT + SHOW VIEW should be enough to display	Martin Hansson	2009-09-28	1	-18/+125
\| \| \| \|/ \| \| \|/\|
\| \| * \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-09-23	1	-0/+2
* \| \| \|	Remove compiler warnings (Including some warnings from -Wstrict-aliasing)	Michael Widenius	2009-11-30	1	-0/+2
* \| \| \|	Added protection around usage of thd->mysys_var	Michael Widenius	2009-11-26	1	-0/+2
\|/ / /
* \| \|	Fixed problem with schema tables and DECIMAL	Michael Widenius	2009-11-02	1	-0/+6
* \| \|	Merge MySQL 5.1.39 into MariaDB 5.1.	unknown	2009-10-15	1	-2/+0
\|\ \ \ \| \|/ /
\| * \|	Fix for bug #46614: Assertion in show_create_trigger()	Ramil Kalimullin	2009-08-14	1	-2/+0
* \| \|	Merge Percona microsec_process patch into MariaDB.	unknown	2009-09-23	1	-4/+9
* \| \|	Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge	Sergey Petrunya	2009-09-15	1	-7/+3
\|\ \ \
\| * \| \|	Updated documentation files to reflect MariaDB and not the Maria storage engi...	Michael Widenius	2009-09-03	1	-7/+3
* \| \| \|	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-6/+15
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	removing unused array (compiler warning)	Guilhem Bichot	2009-07-29	1	-3/+0
\| * \|	Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,...	Guilhem Bichot	2009-07-29	1	-22/+0
\| * \|	Merge from 5.0	Gleb Shchepa	2009-07-24	1	-5/+3
\| \|\ \
\| \| * \|	Bug #38816: kill + flush tables with read lock + stored	Gleb Shchepa	2009-07-24	1	-5/+3
\| \| * \|	Bug #45287: phase 2 : 5.0 64 bit compilation warnings	Georgi Kodinov	2009-07-16	1	-2/+2
\| * \| \|	Fix for bug#45998: database crashes when running	Ramil Kalimullin	2009-07-14	1	-1/+1
\| * \| \|	Bug#45412 SHOW CREATE TRIGGER does not require privileges to disclose trigger...	Sergey Glukhov	2009-06-25	1	-0/+6
\| * \| \|	Bug#44834 strxnmov is expected to behave as you'd expect	Sergey Glukhov	2009-06-19	1	-5/+5
\| \| \| \|
\| \| \ \
\| *-. \ \	Merge from 5.0-bugteam	Staale Smedseng	2009-06-17	1	-9/+9
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|_\| / \| \|/\| \|
\| \| \| *	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-17	1	-4/+4
\| \| * \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-10	1	-4/+4
\| \| \|/
\| \| *	Pull 5.1 treatment of community features into 5.0.	Chad MILLER	2009-05-05	1	-0/+3
\| \| *	Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.	Chad MILLER	2009-04-14	1	-95/+110
\| \| \|\
\| \| \| *	auto-merge	Ignacio Galarza	2009-03-19	1	-14/+29
\| \| \| \|\
\| \| \| * \|	Bug#29125 Windows Server X64: so many compiler warnings	Ignacio Galarza	2009-02-10	1	-81/+81
\| \| * \| \|	Merge from Tim's 5.0.76-release tree to make 5.0.77 .	Chad MILLER	2009-01-21	1	-3/+17
\| \| \|\ \ \ \| \| \| \|/ /
\| \| * \| \|	Merged from 5.0 (enterprise).	Chad MILLER	2008-12-17	1	-14/+28
\| \| \|\ \ \
\| \| * \ \ \	Merge from 5.0 trunk.	Chad MILLER	2008-07-14	1	-0/+2
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Push history-limiting code until after the code that adds new	unknown	2007-11-14	1	-0/+21
* \| \| \| \| \| \|	Merged with mysql-5.1 tree.	Michael Widenius	2009-04-25	1	-5/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to	Georgi Kodinov	2009-03-17	1	-5/+6
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Bug #22047 : Time in SHOW PROCESSLIST for SQL thread in replication	Georgi Kodinov	2009-03-13	1	-2/+3
* \| \| \| \| \| \|	bzr merge from guilhem's maria tree to our local 5.1	Michael Widenius	2009-04-25	1	-12/+37
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except	Guilhem Bichot	2009-04-01	1	-12/+37
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Bug#42758 INFORMATION_SCHEMA.COLUMNS is inconsistent	Sergey Glukhov	2009-03-05	1	-1/+12
\| \| * \| \| \| \| \|	5.0-bugteam->5.1-bugteam merge	Sergey Glukhov	2009-02-25	1	-8/+12
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Bug#40345 MySQLDump prefixes view name with database name when view reference...	Sergey Glukhov	2009-02-25	1	-7/+11
\| \| \| * \| \| \| \|	Bug#30305 Create routine in wrong context in SHOW PRIVILEGES	Sergey Glukhov	2009-02-25	1	-1/+1
\| \| * \| \| \| \| \|	5.0->bugteam->5.1-bugteam merge	Sergey Glukhov	2009-02-18	1	-4/+14
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Bug#25830 SHOW TABLE STATUS behaves differently depending on table name(for 5...	Sergey Glukhov	2009-02-17	1	-4/+14
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
* \| \| \| \| \| \|	Merge with mysql-maria tree	Michael Widenius	2009-02-19	1	-0/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /