summaryrefslogtreecommitdiff
path: root/sql/item.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-27/+58
|\
| * Merge from 5.0 for 43414Staale Smedseng2009-08-281-5/+2
| |\
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-5/+2
| * | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-2/+1
| * | Manual merge between bug#46362 and bug#20577.Mattias Jonsson2009-08-281-11/+39
| |\ \
| | * | Bug#46362: Endpoint should be set to false for TO_DAYS(DATE)Mattias Jonsson2009-08-261-11/+39
| * | | Bug#45261: Crash, stored procedure + decimalDavi Arnaut2009-08-241-9/+16
| |/ /
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+10
|\ \ \
| * | | MWL#17: Table-eliminationSergey Petrunya2009-09-011-2/+2
| * | | MWL#17: Table eliminationSergey Petrunya2009-08-131-24/+2
| * | | MWL#17: Table eliminationSergey Petrunya2009-06-301-10/+5
| * | | AutomergeSergey Petrunia2009-06-251-0/+11
| |\ \ \
| | * | | MWL#17: Table eliminationSergey Petrunia2009-06-251-2/+14
| * | | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+2
| |/ / /
| * | | MWL#17: Table eliminationSergey Petrunia2009-06-221-1/+25
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-51/+292
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merged fix for the bug#46051.Evgeny Potemkin2009-07-191-0/+1
| |\ \ | | |/
| | * Bug#46051: Incorrectly market field caused wrong result.Evgeny Potemkin2009-07-181-0/+1
| * | Automerge.Alexey Kopytov2009-07-031-18/+31
| |\ \
| | * \ Manual merge.Alexey Kopytov2009-07-031-18/+31
| | |\ \
| | | * | Bug #45262: Bad effects with CREATE TABLE and DECIMAL Alexey Kopytov2009-07-031-18/+31
| | | |/
| * | | Bug #45807: crash accessing partitioned table and sql_modeGeorgi Kodinov2009-07-021-2/+8
| * | | Bug#45485 replication different between master/slaver using procedure with gbkSergey Glukhov2009-06-251-2/+2
| |/ /
| | |
| | \
| *-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-4/+0
| |\ \ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-2/+0
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-1/+1
| | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-091-3/+3
| * | merged 36995 to 5.1-bugteamGeorgi Kodinov2009-06-041-0/+3
| |\ \ | | |/
| | * Bug #36995: valgrind error in remove_const during subquery executionsGeorgi Kodinov2009-06-041-0/+3
| * | Bug #44399 : crash with statement using TEXT columns, aggregates, GROUP BY, andGeorgi Kodinov2009-05-251-4/+208
| * | Bug #42778: delete order by null global variable causesGleb Shchepa2009-05-221-2/+3
| * | Fix for bug#44743: Join in combination with concat does not always workRamil Kalimullin2009-05-211-1/+4
| * | manual merge 5.0-bugteam --> 5.1-bugteam (bug 40825)Gleb Shchepa2009-05-191-1/+2
| |\ \ | | |/
| | * Bug#40825: Error 1356 while selecting from a viewGleb Shchepa2009-05-181-1/+2
| * | bug#44166Sergei Golubchik2009-05-041-8/+6
| * | manual merge 5.0-bugteam --> 5.1-bugteamGleb Shchepa2009-04-281-1/+1
| |\ \ | | |/
| | * backport from 6.0:Gleb Shchepa2009-04-281-1/+1
| | * Backport bug #37348 fix 5.1 --> 5.0.Gleb Shchepa2009-04-011-0/+1
| | * Automerge.Alexey Kopytov2009-03-271-11/+19
| | |\
| | * \ MergeLeonard Zhou2009-03-271-2/+19
| | |\ \
| | | * \ auto-mergeIgnacio Galarza2009-03-191-1/+18
| | | |\ \
| | | * \ \ auto-mergeIgnacio Galarza2009-03-191-34/+43
| | | |\ \ \
| | | * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| * | | | | | Automerge.Alexey Kopytov2009-03-271-11/+19
| |\ \ \ \ \ \
| | * \ \ \ \ \ Manual merge.Alexey Kopytov2009-03-271-11/+19
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Fix for bug #43432: Union on floats does unnecessary rounding Alexey Kopytov2009-03-271-11/+19
| | | | |_|/ / | | | |/| | |
| * | | | | | Merge 5.0 to 5.1Leonard Zhou2009-03-271-1/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | BUG#35515 Aliases of variables in binary log are ignored with NAME_CONST.Leonard Zhou2009-03-261-1/+4
| | | |/ / / | | |/| | |
* | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-1/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-03-191-1/+18
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |