| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge. | Sergei Golubchik | 2010-11-25 | 9 | -10/+24 |
| |\ | |||||
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 8 | -53/+54 |
| | |\ | |||||
| | * \ | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 15 | -62/+73 |
| | |\ \ | |||||
| | * \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 3 | -3/+3 |
| | |\ \ \ | |||||
| | * | | | | 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 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | 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 | 2 | -2/+1 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -0/+2 |
| | * | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 4 | -1/+11 |
| | * | | | | | | Post-merge fixes | Sergey Petrunya | 2009-09-15 | 4 | -6/+5 |
| | * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 6 | -8/+8 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 6 | -9/+16 |
| * | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-16 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). | Alexander Nozdrin | 2010-08-12 | 2 | -4/+4 |
| * | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-04 | 2 | -2/+11 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-07-29 | 1 | -16/+8 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Cleanup after bild team push. | Vladislav Vaintroub | 2010-07-25 | 2 | -2/+11 |
| * | | | | | | | | | | 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 |
| * | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -16/+8 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -16/+8 |
| * | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-07-19 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | CMakeLists.txt | Kent Boortz | 2010-06-23 | 2 | -1/+2 |
| * | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 5 | -72/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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 | 4 | -71/+4 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Unset the execute bit where it's not needed. | Davi Arnaut | 2010-07-03 | 2 | -0/+0 |
| * | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 10 | -48/+54 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| | * | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 10 | -48/+54 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| * | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-08 | 13 | -60/+61 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-08 | 15 | -61/+64 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| | | * | | | | | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-08 | 15 | -61/+64 |
| * | | | | | | | 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 | 7 | -24/+0 |
| * | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Bug #43414 Parenthesis (and other) warnings compiling | Staale Smedseng | 2010-02-22 | 3 | -3/+3 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | 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 | 2 | -0/+2 |
| * | | | | | implement convenience libraries | Vladislav Vaintroub | 2009-11-24 | 2 | -7/+3 |
| * | | | | | automerge | Vladislav Vaintroub | 2009-11-13 | 1 | -1/+0 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Bug#47867 compiler warning _WIN32_WINNT macro redefinition | Magnus Blåudd | 2009-10-06 | 1 | -1/+0 |
| * | | | | | WL#5161 : Cross-platform build with CMake | Vladislav Vaintroub | 2009-11-09 | 2 | -12/+23 |
| |/ / / / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |