summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-124-7/+20
* Merged 5.1 maria with 5.1 maria team tree. Automerge.Michael Widenius2008-10-111-2/+2
|\
| * mergedSergei Golubchik2008-10-015-8/+11
| |\
| * | Bug#39392: Maria: if INSERT in UNIQUE finds uncommitted same key, error inste...Sergei Golubchik2008-09-111-2/+2
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-1094-3622/+17307
|\ \ \ | |_|/ |/| |
| * | merged 5.1.29-rc into 5.1-bugteamGeorgi Kodinov2008-09-1021-112/+11360
| |\ \
| | * \ MergeEvgeny Potemkin2008-09-1015-103/+11298
| | |\ \
| | | * \ MergeRamil Kalimullin2008-09-091-4/+6
| | | |\ \
| | | | * \ Bug#35600: Auto merged.Martin Hansson2008-09-091-4/+6
| | | | |\ \
| | | | | * | Bug#35600: Security breach via view, I_S table and preparedMartin Hansson2008-09-091-4/+6
| | | * | | | MergeRamil Kalimullin2008-09-091-7/+13
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix for bug#37526: asymertic operator <=> in triggerRamil Kalimullin2008-09-091-7/+13
| | | * | | | Merging with 5.1-5.1.29-rcMats Kindahl2008-09-091-2/+2
| | | |\ \ \ \
| | | | * \ \ \ merge 5.1-5.1.29-rc to B38701 working treeGeorgi Kodinov2008-09-0812-90/+11261
| | | | |\ \ \ \
| | | | * | | | | Bug #38701: Crash in String::append when inserting duplicate empty strings an...Georgi Kodinov2008-09-051-2/+2
| | | * | | | | | Bug #39106:Mats Kindahl2008-09-092-0/+16
| | | | |/ / / / | | | |/| | | |
| | | * | | | | MergeRamil Kalimullin2008-09-088-78/+257
| | | |\ \ \ \ \
| | | | * \ \ \ \ Bug#36086: Auto merge.Martin Hansson2008-09-088-78/+257
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | Bug#36086: SELECT * from views don't check column grantsMartin Hansson2008-09-038-78/+257
| | | * | | | | | MergeRamil Kalimullin2008-09-081-0/+10978
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | WL#4380: abi_check rule (using gcc -E) for storage engine APINarayanan V2008-09-051-0/+10978
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | | * | | | merging mysql-5.1->mysql-5.1-seaNarayanan V2008-09-0432-689/+2571
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | * | | | WL#4380Narayanan V2008-08-131-0/+10978
| | | | | |\ \ \ \
| | | | | | * \ \ \ merging mysql-5.1 -> mysql-5.1-seaNarayanan V2008-07-311-0/+10978
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ WL#4380Thava Alagu2008-07-091-0/+10978
| | | | | | | |\ \ \ \
| | | | | | | | * | | | WL#4380Narayanan V2008-06-171-0/+10978
| | | * | | | | | | | | MergeRamil Kalimullin2008-09-053-12/+26
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | Fix for bug #39021: SELECT REGEXP BINARY NULL never returnsRamil Kalimullin2008-09-052-10/+23
| | | | * | | | | | | MergeRamil Kalimullin2008-09-051-0/+7
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Fix for bug#38821: Assert table->auto_increment_field_not_null failed Ramil Kalimullin2008-09-031-1/+5
| | * | | | | | | | | | Bug#37908: Skipped access right check caused server crash.Evgeny Potemkin2008-09-052-6/+4
| | |/ / / / / / / / /
| | * | | | | | | | | BUG#32709: Assertion failed: trx_data->empty(), file log.ccMats Kindahl2008-09-031-1/+5
| | * | | | | | | | | Bug #32709: Assertion failed: trx_data->empty(), file log.ccMats Kindahl2008-09-034-0/+43
| | * | | | | | | | | merging with 5.1.29.Andrei Elkin2008-09-031-0/+7
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ merge 5.0 --> 5.1Gleb Shchepa2008-09-031-0/+7
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | / / | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | | * | | | | | | merge with local treeGleb Shchepa2008-09-031-0/+7
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | | * | | | | | Bug #39002: The server crashes on the query:Gleb Shchepa2008-09-031-0/+7
| | * | | | | | | | | Bug#36099 replicate-do-db affects replaying RBR events with mysqlbinlogAndrei Elkin2008-09-031-2/+3
| | |/ / / / / / / /
| * | | | | | | | | Bug #38798 Assertion mysql_bin_log.is_open() failed in binlog_trans_log_savep...Andrei Elkin2008-08-291-5/+7
| |/ / / / / / / /
| * | | | | | | | merge 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2008-08-282-3/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug #37799: SELECT with a BIT column in WHERE clauseGleb Shchepa2008-08-281-2/+1
| | * | | | | | | Bug#38195: Incorrect handling of aggregate functions when loose index scan isEvgeny Potemkin2008-08-271-1/+4
| * | | | | | | | merged 5.1-rpl-merge -> 5.1-bugteamGeorgi Kodinov2008-08-287-37/+144
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merging 5.1 into 5.1-rpl-mergeMats Kindahl2008-08-279-25/+670
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ AutomergeMats Kindahl2008-08-276-30/+124
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Cherry picking post fixes for BUG#37051He Zhenxing2008-08-261-0/+1
| | | * | | | | | | | | Cherry picking patch for BUG#37051He Zhenxing2008-08-266-30/+123
| | * | | | | | | | | | Merge b38773-5.1-rpl-merge into 5.1-rpl-mergeMats Kindahl2008-08-271-7/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporaryMats Kindahl2008-08-271-7/+20
| * | | | | | | | | | | merged 5.1-bugteam into B37548 treeGeorgi Kodinov2008-08-2766-1145/+3312
| |\ \ \ \ \ \ \ \ \ \ \