Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-03-28 | 1 | -0/+16 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0... | Sergey Glukhov | 2011-03-28 | 1 | -0/+16 | |
| * | | | | Merged bug #11766769 to 5.5. | Georgi Kodinov | 2011-03-25 | 1 | -0/+27 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET | Georgi Kodinov | 2011-03-25 | 1 | -0/+27 | |
| * | | | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial | Dmitry Shulga | 2011-03-15 | 1 | -0/+3 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+3 | |
| | | |/ | | |/| | ||||||
| * | | | Bug #59884: setting charset to 2048 crashes | Georgi Kodinov | 2011-02-10 | 1 | -0/+22 | |
| * | | | merge some docs changes and a test case; null merge the code. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -0/+33 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Assorted post-merge fixes, clean-up, integration, compat with 5.6. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -3/+2 | |
| | * | | Bug#43233: Some server variables are clipped during "update," not "check" stage | Tatiana A. Nurnberg | 2010-11-11 | 1 | -0/+34 | |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -18/+6 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+8 | |
| |\ \ | | |/ | ||||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+11 | |
| |\ \ | ||||||
| * \ \ | Automerge MySQL 5.1.44 merge into latest MariaDB trunk. | unknown | 2010-03-10 | 1 | -1/+7 | |
| |\ \ \ | ||||||
| | * \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+7 | |
| | |\ \ \ | ||||||
| * | | | | | Added count of my_sync calls (to SHOW STATUS) | Michael Widenius | 2010-03-09 | 1 | -2/+0 | |
| |/ / / / | ||||||
| * | | | | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -2/+2 | |
| * | | | | Fix multiple test suite failures in Buildbot due to races in the test cases o... | unknown | 2010-01-11 | 1 | -10/+0 | |
| * | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -1/+1 | |
| * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+21 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+7 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -17/+137 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -0/+22 | |
* | | | | | | | | | | merge | Georgi Kodinov | 2010-06-04 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | merge | Georgi Kodinov | 2010-06-04 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| | * | | | | | | | | Bug #52315: utc_date() crashes when system time > year 2037 | Georgi Kodinov | 2010-06-04 | 1 | -0/+8 | |
* | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Bug #37168: Missing variable - skip_name_resolve | Georgi Kodinov | 2010-03-31 | 1 | -0/+9 | |
* | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-02 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | BUG#51866 - crash with repair by sort and fulltext keys | Sergey Vojtovich | 2010-03-25 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-20 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-15 | 1 | -3/+1 | |
* | | | | | | | | | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-02-17 | 1 | -3/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -1/+1 | |
* | | | | | | | | | | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 1 | -48/+53 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase ... | Sergei Golubchik | 2009-12-22 | 1 | -1/+1 | |
| * | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -47/+52 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| | * | | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+6 | |
| | * | | | | | | Bug #32223 SETting max_allowed_packet variable | Staale Smedseng | 2009-06-19 | 1 | -11/+15 | |
| | * | | | | | | Bug#41893: Removal of trailing space noise causing Pushbuild failure. | Patrick Crews | 2009-02-27 | 1 | -1/+1 | |
* | | | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-22 | 1 | -16/+16 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -11/+11 |