Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -4/+4 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -5/+5 |
| |\ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-01-25 | 1 | -2/+2 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-01-25 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | MDEV-4040 Replace deprecated SET OPTION syntax in mysqldump | Sergei Golubchik | 2013-01-25 | 1 | -2/+2 |
| | | * | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -2/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -2/+3 |
| | | | |\ | |||||
| | | | | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -2/+3 |
| | | | | |\ | |||||
| | | * | | \ | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -8/+50 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -8/+50 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -8/+50 |
| | | | | |\ \ | |||||
| | | * | | \ \ | merge | Sergei Golubchik | 2012-04-05 | 1 | -126/+332 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -129/+334 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -129/+334 |
| | | | | |\ \ \ | |||||
| | * | | | | | | | MDEV-3883 Show global status not in order | Sergei Golubchik | 2013-01-08 | 1 | -3/+3 |
| * | | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
| * | | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
* | | | | | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Fixed some compiler warnings | Michael Widenius | 2012-12-19 | 1 | -0/+4 |
| * | | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
* | | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | 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 | -3/+1 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-07 | 1 | -8/+50 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
* | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -9/+33 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -10/+34 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | MDEV-448 Memory loss warnings in mysqldump when more than one schema is dumped | Sergei Golubchik | 2012-08-29 | 1 | -2/+5 |
| | * | | | | | | Automatic merge | Michael Widenius | 2012-08-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 1 | -1/+1 |
| | * | | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -7/+28 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | |||||
| | | * | | | | | Bug #11753490: 44939: sql dumps containing broad views fail when | Georgi Kodinov | 2012-07-04 | 1 | -7/+28 |
* | | | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -12/+11 |
* | | | | | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+4 |
|/ / / / / / / | |||||
* | | | | | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -9/+51 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge | Sergei Golubchik | 2012-06-16 | 1 | -8/+50 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -8/+50 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-07 | 1 | -8/+50 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-04 | 1 | -8/+50 |
| | | | |/ / / / | |||||
| * | | | | | | | Fix for: lp:1013432 and MySQL#64800: | Michael Widenius | 2012-06-15 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Fixed some compiler warnings and test failures found by buildbot | Michael Widenius | 2012-06-13 | 1 | -0/+2 |
* | | | | | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5. | Joerg Bruehe | 2012-03-02 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | AIX builds fail for comments using // | Karen Langford | 2012-02-28 | 1 | -2/+2 |
| * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Bug #11760384 52792: MYSQLDUMP IN XML MODE DOES NOT | Nirbhay Choubey | 2012-01-17 | 1 | -1/+1 |
* | | | | | | | MDEV-186 Client programs throw warnings about memory loss when executed with ... | Sergei Golubchik | 2012-03-23 | 1 | -25/+27 |