Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix for a compiler warning. | Nirbhay Choubey | 2013-11-25 | 1 | -3/+0 |
* | Allow unique prefix for command line options, like any GNU program. | Michael Widenius | 2013-09-23 | 1 | -6/+0 |
* | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -6/+49 |
|\ | |||||
| * | merge back to the 5.5 tree and fix indentation | Georgi Kodinov | 2013-06-28 | 1 | -1/+11 |
| |\ | |||||
| | * | Bug #16996656: UNIQUE OPTION PREFIXES NOT DEPRECATED IN 5.5+ | Georgi Kodinov | 2013-06-26 | 1 | -1/+11 |
| |/ | |||||
| * | Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLES | Ashish Agarwal | 2013-05-19 | 1 | -5/+38 |
* | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Bug #14399795 : ISSUES RELATED TO SETTING AUDIT_LOG_STRATEGY | Georgi Kodinov | 2012-08-17 | 1 | -0/+5 |
* | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o... | Michael Widenius | 2012-09-18 | 1 | -6/+4 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 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 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed wrong info message for mysqld --general-log | Michael Widenius | 2011-10-16 | 1 | -2/+4 |
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -2/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-09-24 | 1 | -2/+1 |
* | | | | | | adding DBUG_ENTER/DBUG_RETURN tags that were useful when fixing memory leaks | Sergei Golubchik | 2011-07-10 | 1 | -38/+62 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -18/+40 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -2/+2 |
| * | | | | | BUG#57953 my_load_defaults return junk argument ----args-separator---- to caller | He Zhenxing | 2011-01-17 | 1 | -2/+2 |
| * | | | | | Bug#46393 If for slow_query_log a string is entered it does not complain. | Alexey Botchkov | 2011-01-15 | 1 | -5/+13 |
| * | | | | | Bug#51631 general-log flag doesn't accept "on" as a value in | Magne Mahre | 2011-01-10 | 1 | -1/+19 |
| * | | | | | Bug#54569 Some options are not allowed to take argument when passed with loos... | Kristofer Pettersson | 2010-10-25 | 1 | -13/+9 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -3/+4 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -8/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -1/+0 |
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -12/+15 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -12/+15 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -6/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -6/+7 |
| | |\ \ \ | |||||
| * | | | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -20/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+9 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -8/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | More after-merge fixes for merging MySQL 5.1.38 into MariaDB. | unknown | 2009-09-15 | 1 | -2/+3 |
| * | | | | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | MBug#423035: error in parsing enum value for plugin variable in mysqld comman... | unknown | 2009-09-03 | 1 | -1/+4 |
| * | | | | | | | | | | After-merge fix for MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-11 | 1 | -2/+8 |
| * | | | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -3/+15 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix accessing ulong enum option as uint, failing on 64-bit big-endian. | unknown | 2009-05-20 | 1 | -3/+3 |
| * | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ |