Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -2/+4 |
|\ | |||||
| * | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+4 |
* | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -10/+5 |
|\ \ | |/ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -10/+5 |
| |\ | |||||
| | * | 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 | -2/+2 |
* | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+4 |
|/ / / | |||||
* | | | 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 | -3/+5 |
|\ \ \ | |||||
| * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+4 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-07-22 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 1 | -6/+3 |
| | |\ \ \ | |||||
| | | * | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 1 | -7/+3 |
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 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/+5 |
* | | | | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -7/+2 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -6/+26 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned arc... | Michael Widenius | 2011-06-11 | 1 | -5/+25 |
| * | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | adding DBUG_ENTER/DBUG_RETURN tags that were useful when fixing memory leaks | Sergei Golubchik | 2011-07-10 | 1 | -40/+73 |
* | | | | | fix memory leaks and other problems found by safemalloc | Sergei Golubchik | 2011-07-10 | 1 | -17/+24 |
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -2/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -13/+77 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -2/+2 |
| * | | | | Bug #11755431 (former 47205) | Jon Olav Hauglid | 2011-03-08 | 1 | -6/+48 |
| * | | | | Bug#58139 : default-auth option not recognized in MySQL standard | Nirbhay Choubey | 2011-01-16 | 1 | -0/+15 |
| * | | | | Bug#35269 mysqlcheck behaves different depending on order of parameters | Alexey Botchkov | 2010-10-08 | 1 | -1/+10 |
| * | | | | Fix for Bug#57094 (Copyright notice incorrect?). | Alexander Nozdrin | 2010-10-06 | 1 | -6/+3 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -19/+47 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Fixed build failures | Michael Widenius | 2010-09-06 | 1 | -11/+13 |
| * | | | Nicer output for mysql_upgrade | Michael Widenius | 2010-09-05 | 1 | -0/+8 |
| * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -5/+20 |
| * | | | Fixed compiler warnings from Windows compiler | Michael Widenius | 2010-08-11 | 1 | -2/+2 |
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -29/+29 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -11/+11 |
| |\ \ \ \ | |||||
| * | | | | | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -1/+2 |
* | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -18/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -12/+0 |
| * | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -6/+6 |
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-09 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -2/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -30/+30 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -29/+29 |
| | |/ / | |/| | |