Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -5/+9 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -7/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -16/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Bug#34374: mysql generates incorrect warning | Sergei Golubchik | 2008-11-29 | 1 | -2/+1 |
| | * | | | | | | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Added maria_zerofill() | unknown | 2007-12-31 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | after merge | unknown | 2007-12-28 | 1 | -2/+0 |
| | * | | | | | | | | | | | | | Fixes to merge. | unknown | 2007-12-20 | 1 | -20/+22 |
| | * | | | | | | | | | | | | | Fixed after-merge problems. | unknown | 2007-12-16 | 1 | -10/+11 |
| | * | | | | | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -24/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | mysys/my_getopt.c | unknown | 2007-10-19 | 1 | -13/+19 |
| | | * | | | | | | | | | | | | | my_getopt: enforce "correctness" (min/max/block_size) of default values | unknown | 2007-10-13 | 1 | -27/+46 |
* | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5-merge. | Alexander Nozdrin | 2010-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-09-24 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | | Bug#55873 short startup options do not work in 5.5 | Marc Alff | 2010-09-01 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Implemented code review comments | Marc Alff | 2010-08-26 | 1 | -28/+11 |
* | | | | | | | | | | | | | | | | Bug#55873 short startup options do not work in 5.5 | Marc Alff | 2010-08-25 | 1 | -7/+93 |
* | | | | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-05 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Bug #42144: plugin_load fails | Georgi Kodinov | 2010-08-04 | 1 | -5/+5 |
* | | | | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-03 | 1 | -10/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |