| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge 5.5 -> 10.0-base | unknown | 2013-08-20 | 1 | -2/+2 |
| |\ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits. | Michael Widenius | 2013-06-11 | 1 | -1/+1 |
| * | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+5 |
| |\ \ | |/ | |||||
| | * | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+5 |
| | |\ | |||||
| | | * | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -1/+1 |
| * | | | | create sys_var::val_str(), sys_var::val_int(), sys_var::val_real(). | Sergei Golubchik | 2013-04-09 | 1 | -10/+0 |
| * | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION | Martin Hansson | 2012-08-24 | 1 | -2/+2 |
| * | | | pbxt suite is now a main-pbxt overlay | Sergei Golubchik | 2012-02-29 | 1 | -4/+4 |
| * | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+0 |
| | |\ \ \ | |||||
| * | | | | | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -10/+10 |
| * | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+4 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -1/+2 |
| | * | | | | Merge with 5.2 | Michael Widenius | 2011-09-15 | 1 | -0/+2 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Increased version number | Michael Widenius | 2011-09-13 | 1 | -0/+2 |
| * | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -6/+37 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+52 |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+23 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+33 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+33 |
| | | |\ \ \ | |||||
| | * | | | | | MWL #21: "index_merge: non-ROR intersection". | Igor Babaev | 2010-12-01 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -0/+1 |
| * | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+77 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-03-28 | 1 | -24/+0 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Fixed a test failure in embedded because of the fix for BUG#11766769 | Georgi Kodinov | 2011-03-28 | 1 | -23/+0 |
| | * | | | | 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 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |