Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -7/+6 |
|\ | |||||
| * | Fix LP bug lp:802979 | unknown | 2011-07-04 | 1 | -3/+3 |
| * | Buildbot fixes: | Sergey Petrunya | 2011-06-03 | 1 | -1/+0 |
| * | Buildbot fixes: let mysql-test/t/sp.test set @@query_cache_size only if the s... | Sergey Petrunya | 2011-06-03 | 1 | -2/+2 |
| * | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ | |||||
| | * | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
* | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+48 |
|\ \ \ | |||||
| * \ \ | merged mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-03-17 | 1 | -0/+30 |
| |\ \ \ | |||||
| | * | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes in | Alexander Nozdrin | 2011-03-10 | 1 | -0/+30 |
| * | | | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) | Jorgen Loland | 2011-03-14 | 1 | -0/+18 |
| |/ / / | |||||
* | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -3/+3 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -6/+5 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -4/+3 |
| |\ \ | |||||
| | * \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#47974 'TYPE=storage_engine' is deprecated and will be | Magne Mahre | 2010-02-09 | 1 | -2/+2 |
| | * | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -2/+1 |
| | |/ | |||||
| * | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -0/+90 |
| |\ \ | | |/ | |||||
| * | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -5/+5 |
* | | | Auto-merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2010-07-30 | 1 | -9/+167 |
* | | | Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect | Alexander Nozdrin | 2010-05-14 | 1 | -2/+2 |
* | | | A fix for Bug#11918 "SP does not accept variables in LIMIT clause" | Konstantin Osipov | 2010-04-14 | 1 | -0/+103 |
* | | | Manual merge. | Alexey Kopytov | 2010-03-19 | 1 | -23/+9 |
|\ \ \ | |||||
| * | | | Bug #8433: Overflow must be an error | Alexey Kopytov | 2010-03-18 | 1 | -23/+9 |
* | | | | Bug#31767 DROP FUNCTION name resolution | Marc Alff | 2010-02-23 | 1 | -2/+2 |
|/ / / | |||||
* | | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 1 | -2/+2 |
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -0/+16 |
|\ \ \ | |||||
| * \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-22 | 1 | -8/+8 |
| |\ \ \ | |||||
| * \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -0/+16 |
| |\ \ \ \ | |||||
| | * \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-25 | 1 | -0/+16 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug#47649 crash during CALL procedure | Sergey Glukhov | 2009-12-23 | 1 | -0/+16 |
* | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -8/+8 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | backported: | Sergey Glukhov | 2010-01-15 | 1 | -8/+8 |
| |/ / / / | |||||
* | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -6/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 1 | -6/+3 |
| |\ \ \ \ | |||||
| | * | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -6/+3 |
* | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -10/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -10/+10 |
| |/ / / / | |||||
* | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -0/+58 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+58 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -57/+33 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crash | Davi Arnaut | 2009-11-12 | 1 | -0/+58 |
* | | | | | Backport of revno: 3673 | Jon Olav Hauglid | 2009-12-10 | 1 | -0/+59 |
* | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2009-12-03 | 1 | -9/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -9/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -9/+0 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -9/+0 |
| | | | |/ | | | |/| | |||||
* | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -4/+2 |
|/ / / / | |||||
* | | | | Enable test cases for Bug#6063 and Bug#7088. | Magne Mahre | 2009-11-20 | 1 | -0/+34 |
* | | | | Backport of Bug#36649 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -0/+95 |
| |_|/ |/| | | |||||
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -7/+0 |
|\ \ \ |