Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Bug #42144: plugin_load fails | Georgi Kodinov | 2010-08-04 | 1 | -5/+5 |
| | * | Bug #42144: plugin_load fails | Georgi Kodinov | 2010-08-03 | 1 | -10/+14 |
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -7/+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 |
|\ \ | |/ | |||||
| * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -19/+17 |
* | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -0/+9 |
* | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -8/+2 |
|\ \ | |/ | |||||
| * | Bug#46043 mysqld --skip-innodb does not skip InnoDB | Kristofer Pettersson | 2009-11-09 | 1 | -11/+11 |
* | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Bug#46586: When using the plugin interface the type "set" for options caused ... | Tatiana A. Nurnberg | 2009-10-27 | 1 | -1/+3 |
* | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -1/+1 |
| |\ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -1/+1 |
| | * | Bug#31177: Server variables can't be set to their current values | unknown | 2007-12-06 | 1 | -2/+0 |
| | * | Bug#31177: Server variables can't be set to their current values | unknown | 2007-12-03 | 1 | -1/+3 |
* | | | 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 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Bug#45336 --enable-foobar doesn't work for any plugin foobar. | Kristofer Pettersson | 2009-06-25 | 1 | -2/+13 |
| * | | Bug#19027 MySQL 5.0 starts even with Fatal InnoDB errors | Kristofer Pettersson | 2009-05-14 | 1 | -1/+2 |
* | | | 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 |
|\ \ \ | |/ / | |||||
| * | | 36446: fix Windows warning | Tatiana A. Nurnberg | 2009-03-17 | 1 | -1/+1 |
| * | | Bug#36446: Attempt to set @@join_buffer_size to its minimum value produces sp... | Tatiana A. Nurnberg | 2009-03-16 | 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 |
| |\ \ \ | | |/ / | |||||
| | * | | merging. | Alexey Botchkov | 2009-02-24 | 1 | -5/+9 |
| | |\ \ | |||||
| | | * | | Bug#39289 libmysqld.a calls exit() upon error | Alexey Botchkov | 2008-10-27 | 1 | -12/+21 |
| * | | | | 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 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Bug#31177: Server variables can't be set to their current values | Tatiana A. Nurnberg | 2009-01-12 | 1 | -6/+8 |
* | | | | 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 |