Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -0/+2 |
|\ | |||||
| * | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -0/+2 |
* | | Client attributes | unknown | 2013-10-03 | 1 | -0/+3 |
* | | merge 10.0-base -> 10.0 | unknown | 2013-09-26 | 1 | -1/+9 |
|\ \ | |/ | |||||
| * | MDEV-4684 - Enhancement request: --init-command support for mysqlslap | Sergey Vojtovich | 2013-09-17 | 1 | -1/+9 |
* | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -3/+3 |
| | | * | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS | Venkata Sidagam | 2012-04-09 | 1 | -1/+2 |
| | * | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5 | Georgi Kodinov | 2012-07-05 | 1 | -0/+12 |
* | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -1/+1 |
* | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -1/+5 |
|/ / / | |||||
* | | | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merged from 5.1 to 5.5 | Venkata Sidagam | 2012-04-09 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS | Venkata Sidagam | 2012-04-09 | 1 | -1/+2 |
| | |/ | |||||
* | | | MDEV-186 Client programs throw warnings about memory loss when executed with ... | Sergei Golubchik | 2012-03-23 | 1 | -0/+2 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+3 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -3/+8 |
| | | | |\ \ | |||||
* | | | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 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 | -9/+10 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | fix warnings | Vladislav Vaintroub | 2011-06-13 | 1 | -8/+8 |
| * | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -11/+19 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -11/+19 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| * | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | fix memory leaks and other problems found by safemalloc | Sergei Golubchik | 2011-07-10 | 1 | -0/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -20/+37 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -2/+2 |
| * | | | | Merging patch for bug#11765157 from mysql-5.1. | Nirbhay Choubey | 2011-04-08 | 1 | -3/+8 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug#11765157 - 58090: mysqlslap drops schema specified in | Nirbhay Choubey | 2011-04-08 | 1 | -3/+8 |
| | | |/ | | |/| | |||||
| * | | | Bug#58139 : default-auth option not recognized in MySQL standard | Nirbhay Choubey | 2011-01-16 | 1 | -0/+14 |
| * | | | Merging from mysql-5.1. | Nirbhay Choubey | 2011-01-13 | 1 | -5/+15 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#59109 : mysqlslap crashes on mysql_fetch_row after ignoring | Nirbhay Choubey | 2011-01-13 | 1 | -5/+15 |
| * | | | Fix for Bug#57094 (Copyright notice incorrect?). | Alexander Nozdrin | 2010-10-06 | 1 | -9/+4 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -63/+107 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | This patch fixes LP#613408 Memory corruption with (M)aria storage engine and... | Michael Widenius | 2010-08-07 | 1 | -1/+1 |
| * | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -58/+55 |
| |\ \ | | |/ | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -6/+6 |
| |\ \ | |||||
| * | | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -15/+22 |
| * | | | Merge | Michael Widenius | 2009-12-03 | 1 | -10/+8 |
| |\ \ \ | |||||
| | * \ \ | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -10/+8 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 1 | -5/+11 |
| | | |\ \ \ | |||||
| * | | \ \ \ | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -5/+11 |
| |\ \ \ \ \ \ | | |/ / / / / |