Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 2 | -173/+217 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -18/+44 |
| |\ | |||||
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -18/+44 |
| | |\ | |||||
| * | \ | Merge with MariaDB 5.1 | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -17/+194 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed warnings and build failures after last push | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -17/+194 |
| | |\ \ | |||||
| * | \ \ | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+2 |
| * | | | | merged | Sergei Golubchik | 2010-05-15 | 1 | -0/+45 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Cherry-pick fix for Bug#53371, security hole with bypassing grants using spec... | unknown | 2010-05-09 | 1 | -0/+45 |
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Fix multiple test suite failures in Buildbot due to races in the test cases o... | unknown | 2010-01-11 | 1 | -6/+40 |
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -33/+61 |
| |\ \ \ | |||||
| * \ \ \ | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -7/+7 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -7/+7 |
| | |\ \ \ \ | |||||
| * | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -3/+3 |
| |/ / / / / | |||||
| * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 3 | -96/+288 |
| |\ \ \ \ \ | |||||
| * | | | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -1/+5 |
| * | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -6/+73 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -6/+73 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix two missing DBUG_RETURN. | unknown | 2009-04-21 | 1 | -0/+2 |
| * | | | | | | | | | Fixed test written by windows to get it working under linux (line endings) | unknown | 2009-04-03 | 1 | -142/+142 |
| |/ / / / / / / / | |||||
| * | | | | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -0/+118 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -5/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -52/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -7/+251 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -132/+286 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fixed compiler warnings in a lot of files | unknown | 2008-02-13 | 1 | -5/+8 |
* | | | | | | | | | | | | | | | Auto-merge from mysql-5.1-bugteam. | Dmitry Shulga | 2010-09-07 | 1 | -0/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fixed bug #47485 - mysql_store_result returns a not NULL result set | Dmitry Shulga | 2010-09-07 | 1 | -0/+102 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). | Alexander Nozdrin | 2010-08-12 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-04 | 2 | -223/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL | Davi Arnaut | 2010-07-24 | 1 | -14/+14 |
| * | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -209/+0 |
* | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-30 | 1 | -10/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-07-30 | 1 | -10/+39 |
* | | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 2 | -3/+3 |
* | | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-09 | 1 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -13/+13 |
| * | | | | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Unset the execute bit where it's not needed. | Davi Arnaut | 2010-07-03 | 1 | -0/+0 |
* | | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-28 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | / / / / / / / / / / / / / | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-28 | 1 | -0/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-06-28 | 1 | -0/+58 |