Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 15 | -15/+19 |
|\ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 15 | -15/+19 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 14 | -56/+47 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 5 | -5/+10 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 4 | -39/+11 |
|\ \ \ \ | |||||
| * | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 2 | -3/+3 |
| * | | | | fixes for solaris 10 | Sergei Golubchik | 2011-01-26 | 2 | -0/+8 |
| * | | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 4 | -13/+0 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 10 | -28/+99 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge | Kent Boortz | 2010-12-29 | 6 | -0/+99 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge | Kent Boortz | 2010-12-29 | 11 | -1/+160 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 11 | -1/+160 |
| * | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 4 | -28/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 6 | -5/+17 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 6 | -37/+41 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 5 | -4/+7 |
| |\ \ \ | |||||
| * | | | | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 1 | -1/+0 |
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -46/+42 |
| |\ \ \ \ | |||||
| * | | | | | YaSSL cert info buffer overflow fix | Sergei Golubchik | 2010-01-27 | 2 | -49/+67 |
| * | | | | | Fix some compiler warnings. | unknown | 2009-12-06 | 1 | -1/+2 |
| * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -0/+2 |
| * | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 3 | -0/+6 |
| * | | | | | | Post-merge fixes | Sergey Petrunya | 2009-09-15 | 2 | -3/+3 |
| * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 2 | -4/+8 |
* | | | | | | | | 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 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Cleanup after bild team push. | Vladislav Vaintroub | 2010-07-25 | 1 | -1/+5 |
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Bug#53463: YaSSL patch appears to be reverted | Davi Arnaut | 2010-07-28 | 1 | -1/+1 |
* | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-07-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | CMakeLists.txt | Kent Boortz | 2010-06-23 | 1 | -0/+1 |
* | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 2 | -62/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -1/+1 |
| * | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -61/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | 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-07-02 | 8 | -46/+46 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 8 | -46/+46 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-08 | 4 | -4/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-08 | 5 | -4/+7 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-08 | 5 | -4/+7 |
* | | | | | | Bug #53445 Build with -Wall and fix warnings that it generates | Tor Didriksen | 2010-05-26 | 1 | -1/+1 |
* | | | | | | Another incarnation of the patch for Bug#30708 | Alexander Nozdrin | 2010-05-19 | 4 | -13/+0 |
* | | | | | | merge | Vladislav Vaintroub | 2010-02-06 | 2 | -55/+69 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Auto-merge. | Ramil Kalimullin | 2010-01-13 | 2 | -55/+69 |
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | |||||
| | * | | | Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL | Ramil Kalimullin | 2010-01-13 | 2 | -55/+69 |
* | | | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE | Vladislav Vaintroub | 2009-12-01 | 1 | -0/+1 |
* | | | | | implement convenience libraries | Vladislav Vaintroub | 2009-11-24 | 1 | -5/+1 |