Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+4 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+4 |
| | |\ | |||||
| | | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | merge 5.0-security => 5.1-security | Tor Didriksen | 2011-07-15 | 1 | -1/+0 |
| | | | |\ | |||||
| | | | | * | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL | Tor Didriksen | 2011-07-15 | 1 | -1/+0 |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+1 |
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+4 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge: mwl#24+mwl#21 5.1->5.2 | Igor Babaev | 2010-12-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | MWL #21: "index_merge: non-ROR intersection". | Igor Babaev | 2010-12-01 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bug #36022 please log more information about "Sort aborted" queries | Tor Didriksen | 2011-02-02 | 1 | -3/+1 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+2 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+7 |
| |/ / / | |||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+2 |
| |\ \ \ | |||||
| * | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -1/+1 |
* | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -67/+19 |
* | | | | merge | Mattias Jonsson | 2010-02-10 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table | Mattias Jonsson | 2010-02-10 | 1 | -0/+3 |
* | | | | | backported: | Sergey Glukhov | 2010-01-15 | 1 | -0/+5 |
* | | | | | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -2/+2 |
* | | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -2/+3 |
| |/ / / | |||||
* | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -1/+5 |
|/ / / | |||||
* | | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -2/+2 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 1 | -2/+2 |
| * | Bug#37428 Potential security issue with UDFs - linux shellcode execution. | Sergey Glukhov | 2008-08-25 | 1 | -0/+3 |
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 | unknown | 2008-04-09 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 | unknown | 2008-04-02 | 1 | -0/+1 |
| |\ \ | |||||
* | \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776 | unknown | 2008-04-09 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 | unknown | 2008-04-09 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Follow-up to B-g#15776, test failures on 64-bit linux. | unknown | 2008-04-09 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 | unknown | 2008-03-31 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#15776: 32-bit signed int used for length of blob | unknown | 2007-08-31 | 1 | -0/+1 |
* | | | | Merge trift2.:/MySQL/M51/mysql-5.1 | unknown | 2008-03-14 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236 | unknown | 2008-02-20 | 1 | -1/+0 |
| |\ \ \ \ | |||||
| | * | | | | Fix for bug #31236: Inconsistent division by zero behavior for | unknown | 2008-02-20 | 1 | -1/+0 |