summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-12111-3456/+8210
|\
| * Fix build failure.Alexander Nozdrin2009-11-102-1/+8
| * Auto-merge from mysql-next-mr-alik.Alexander Nozdrin2009-11-101-1/+2
| |\
| | * Merge BUG#48161, BUG#48447Mikael Ronstrom2009-11-061-1/+2
| | |\
| | | * BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary c...Mikael Ronstrom2009-11-051-1/+2
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1017-137/+240
| |\ \ \ | | |/ /
| | * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-0596-3015/+7329
| | |\ \ | | | |/
| | * | sql_plugin.cc: error log messages should not depend on the current_thd lc_mes...Sergei Golubchik2009-11-031-1/+1
| | * | WL#4903 Plugin Service API part ISergei Golubchik2009-11-029-95/+197
| | * | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-308-42/+43
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-065-2/+72
| |\ \ \
| | * \ \ A fix and a test case for Konstantin Osipov2009-11-035-6/+78
| | |\ \ \
| | | * | | A fix and a test case forKonstantin Osipov2009-11-035-7/+79
| * | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-066-15/+15
| |\ \ \ \ \
| | * | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-056-15/+15
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0633-413/+620
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-0511-179/+157
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug#48177 - SELECTs with NOT IN subqueries containing NULL Jorgen Loland2009-11-031-42/+54
| | | * | | | Manual Mergeunknown2009-11-031-0/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on masterunknown2009-11-031-0/+1
| | | | * | | Automerge.Alexey Kopytov2009-10-302-28/+65
| | | | |\ \ \
| | | * | | | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe...Davi Arnaut2009-11-0210-137/+102
| | * | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-057-98/+138
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | mergeVladislav Vaintroub2009-11-0352-512/+914
| | | |\ \ \ \ \
| | | | * \ \ \ \ Auto-merging mysql-5.1-bugteam-gca into mysql-5.1-bugteam latest.Luis Soares2009-11-021-5/+25
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Auto-merging bzr bundle from bug report in mysql-5.1-bugteam-gcaLuis Soares2009-11-021-5/+25
| | | | | |\ \ \ \ \
| | | | | | * | | | | BUG#48297: Schema name is ignored when LOAD DATA is written into Luis Soares2009-10-271-5/+25
| | | | * | | | | | | Bug#47925: regression of range optimizer and date comparison in 5.1.39!Martin Hansson2009-11-026-93/+113
| | | | |/ / / / / /
| | * | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-3/+8
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | auto-mergeTatiana A. Nurnberg2009-11-029-57/+161
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Bug#48295: explain extended crash with subquery and ONLY_FULL_GROUP_BY sql_modeTatiana A. Nurnberg2009-10-291-3/+8
| | * | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-052-1/+16
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-012-1/+16
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-242-1/+17
| | * | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-2/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge fix for BUG#43171.Sergey Vojtovich2009-10-312-2/+10
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()Sergey Vojtovich2009-10-282-2/+10
| | * | | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-28/+65
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Automerge.Alexey Kopytov2009-10-302-28/+65
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-10-302-28/+65
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Bug #48131: crash group by with rollup, distinct, filesort,Alexey Kopytov2009-10-302-28/+65
| | * | | | | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-053-5/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | mergeGeorgi Kodinov2009-10-302-3/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Bug #48291 : crash with row() operator,select into @var, and Georgi Kodinov2009-10-302-3/+16
| | | * | | | | | | | | | | mergeGeorgi Kodinov2009-10-302-2/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Bug #48293: crash with procedure analyse, view with > 10 columns,Georgi Kodinov2009-10-302-2/+13
| | | * | | | | | | | | | | mergeGeorgi Kodinov2009-10-301-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Bug #42116 : Mysql crash on specific queryGeorgi Kodinov2009-10-291-0/+3
| | | | * | | | | | | | | | automergeSergey Glukhov2009-10-271-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | An addition to fix forSergey Vojtovich2009-10-271-2/+2