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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge of mysql-5.1-bugteam into mysql-trunk-merge.	Davi Arnaut	2010-07-20	1	-8/+7
\|\
\| *	Bug#45288: pb2 returns a lot of compilation warnings on linux	Davi Arnaut	2010-07-20	1	-7/+6
* \|	Merge of mysql-trunk-bugfixing into mysql-trunk-merge.	Davi Arnaut	2010-07-15	1	-3/+3
\|\ \
\| * \|	WL#5486: Remove code for unsupported platforms	Davi Arnaut	2010-07-15	1	-1/+1
\| * \|	Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled	Davi Arnaut	2010-07-08	1	-2/+2
* \| \|	merge	Georgi Kodinov	2010-07-14	1	-23/+33
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Bug #51876: crash/memory underrun when loading data with ucs2	Georgi Kodinov	2010-07-14	1	-23/+33
* \|	merge	Georgi Kodinov	2010-06-09	1	-0/+4
\|\ \ \| \|/
\| *	Merge	Georgi Kodinov	2010-06-09	1	-0/+4
\| \|\
\| \| *	Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status	Georgi Kodinov	2010-04-07	1	-0/+4
* \| \|	Bug #49829 Many "hides virtual function" warnings with SunStudio	Tor Didriksen	2010-05-31	1	-3/+3
* \| \|	Auto-merge from mysql-trunk.	Alexander Nozdrin	2010-05-28	1	-16/+7
\|\ \ \
\| * \ \	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.	Alexey Kopytov	2010-05-11	1	-2/+0
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Bug#53189 Table map version unused and can be removed	He Zhenxing	2010-05-08	1	-2/+0
\| * \| \|	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	Alexey Kopytov	2010-05-07	1	-7/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Bug#50373 --secure-file-priv=""	Kristofer Pettersson	2010-05-03	1	-7/+4
\| * \| \|	Manual merge of local mysql-trunk-merge with bk-internal.	Alexey Kopytov	2010-05-07	1	-1/+1
\| \|\ \ \
\| \| * \ \	Manual merge from mysql-trunk.	Alexander Nozdrin	2010-05-07	1	-1/+1
\| \| \|\ \ \
\| * \| \ \ \	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	Alexey Kopytov	2010-04-30	1	-3/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| / / \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Automerge	Kristofer Pettersson	2010-04-16	1	-5/+3
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Bug#50373 --secure-file-priv=""	Kristofer Pettersson	2010-04-16	1	-3/+1
\| * \| \| \|	Manual merge of mysql-5.1-bugteam to	Alexey Kopytov	2010-04-19	1	-1/+14
\| \|\ \ \ \
\| * \ \ \ \	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	Alexey Kopytov	2010-04-02	1	-5/+3
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Bug#51377 Crash in information_schema / processlist on concurrent DDL wo...	Alexey Botchkov	2010-03-09	1	-5/+3
\| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Backport Bug#37148 to 5.1	He Zhenxing	2010-01-24	1	-14/+18
* \| \| \| \|	Merge trunk -> trunk-runtime.	Konstantin Osipov	2010-05-13	1	-1/+1
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Bug#51571 load xml infile causes server crash	Alexander Barkov	2010-05-05	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Committing on behalf or Dmitry Lenev:	Konstantin Osipov	2010-04-28	1	-2/+8
\|/ / /
* \| \|	WL#5030: Split and remove mysql_priv.h	Mats Kindahl	2010-03-31	1	-1/+14
\|/ /
* \|	Followup to Bug#45225 Locking: hang if drop table with no timeout	Jon Olav Hauglid	2010-02-24	1	-1/+1
* \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-06	1	-0/+6
\|\ \
\| * \	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2010-01-19	1	-0/+6
\| \|\ \
\| \| * \	Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.	Alexey Kopytov	2010-01-15	1	-0/+6
\| \| \|\ \ \| \| \| \|/
\| \| \| *	BUG#49479: Slave stops with syntax error: LOAD DATA event without	Luis Soares	2009-12-06	1	-0/+6
* \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-05	1	-3/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-13	1	-6/+7
\| \|\ \ \
\| * \ \ \	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-07	1	-3/+3
\| \|\ \ \ \
\| \| * \ \ \	merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1	Alfranio Correia	2009-12-17	1	-3/+3
\| \| \|\ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| \| * \| \|	mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...	Andrei Elkin	2009-11-30	1	-10/+30
\| \| \| \|\ \ \
\| \| \| * \ \ \	merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...	Andrei Elkin	2009-11-10	1	-13/+101
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	WL#2687 WL#5072 BUG#40278 BUG#47175	Alfranio Correia	2009-11-03	1	-2/+2
\| \| \| * \| \| \| \|	merged fixes for BUG#39934 to 5.1-rpl+3	Sven Sandberg	2009-09-30	1	-1/+1
\| \| \| \|\ \ \ \ \
\| \| \| \| * \ \ \ \	Merged fix for BUG#39934 up a few revisions.	Sven Sandberg	2009-07-14	1	-1/+1
\| \| \| \| \|\ \ \ \ \
\| \| \| \| \| * \| \| \| \|	BUG#39934: Slave stops for engine that only support row-based logging	Sven Sandberg	2009-07-14	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-04	1	-14/+18
* \| \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284	Konstantin Osipov	2010-02-03	1	-6/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	WL#2360 Performance schema	Marc Alff	2010-01-06	1	-6/+7
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge next-mr -> next-4284.	Konstantin Osipov	2010-02-02	1	-7/+11
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-12-12	1	-7/+11
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Manual merge from mysql-trunk.	Alexander Nozdrin	2009-12-11	1	-20/+548
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|