Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 6 | -3/+17 |
|\ \ | |/ |/| | |||||
| * | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 4 | -1/+15 |
| |\ | |||||
| | * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 4 | -1/+15 |
| | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -0/+11 |
| | |\ | |||||
| | | * | Bug#39370: wrong output for error code 153 | Chad MILLER | 2009-02-24 | 1 | -0/+11 |
| * | | | Fix incorrect filename in verbose output of innochecksum. (Bug #44484, | Jim Winstead | 2009-05-05 | 1 | -1/+1 |
| * | | | Make help text for perror more accurate. (Bug #34574) | Jim Winstead | 2009-04-28 | 1 | -1/+1 |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 5 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 5 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 9 | -23/+23 |
| | |/ | |||||
* | | | Fix build error in some configs. | unknown | 2009-03-13 | 1 | -1409/+0 |
* | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 43 | -3/+20153 |
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 2 | -3/+4 |
|\ \ \ | |/ / | |||||
| * | | Bug#41612: resolve_stack_dump does not decode 5.1 stack trace | Davi Arnaut | 2008-12-19 | 1 | -1/+2 |
| * | | Replace C++ comment in a header file. Thanks, Alik! | Chad MILLER | 2008-12-08 | 1 | -2/+2 |
* | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 2 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+6 |
| |\ \ | |||||
| | * \ | Merge main 5.1 branch -> 5.1-build (team tree). | Joerg Bruehe | 2008-10-04 | 4 | -482/+2 |
| | |\ \ | |||||
| * | \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 4 | -482/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -2/+2 |
| * | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 4 | -55/+51 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -2/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | handshake.cpp: | unknown | 2008-01-11 | 3 | -1/+16 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge janus.mylan:/data0/mysqldev/users/serg/mysql-5.0-release | unknown | 2008-01-11 | 3 | -1/+16 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Bugs fixed: | unknown | 2008-01-07 | 1 | -0/+1 |
* | | | | | | | | | | Addendum to the fix for bug #39178: Server crash in YaSSL | Georgi Kodinov | 2008-12-02 | 1 | -0/+1 |
* | | | | | | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-11-27 | 1 | -2/+38 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Bug#34825 perror on windows doesn't know about win32 error codes | Sergey Glukhov | 2008-11-27 | 1 | -2/+38 |
| * | | | | | | | | | Auto merge 5.0-build -> 5.0-bugteam | Timothy Smith | 2008-09-10 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | Update to change for bug 39178. Revert error-handling change, perhaps | Chad MILLER | 2008-11-20 | 1 | -1/+1 |
* | | | | | | | | | | | Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \ | Chad MILLER | 2008-11-18 | 11 | -97/+275 |
* | | | | | | | | | | | Auto merge 5.1-build -> 5.1-bugteam | Timothy Smith | 2008-09-10 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build | Joerg Bruehe | 2008-08-27 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build | Joerg Bruehe | 2008-08-25 | 1 | -1/+6 |
* | | | | | | | | | Fix "make dist" error - remove Visual Studio project files from | Vladislav Vaintroub | 2008-09-01 | 2 | -3/+2 |
* | | | | | | | | | merge | Vladislav Vaintroub | 2008-09-01 | 2 | -479/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Bug #33907 : Errors compiling mysql with Microsoft Visual C++ Express 2008 | Vladislav Vaintroub | 2008-08-21 | 2 | -479/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | fixes for warnings and compile errors for the fix of bug 26243 | unknown | 2008-03-29 | 1 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | perror.c: | unknown | 2008-03-28 | 1 | -0/+1 |
* | | | | | | | Fixed problem with non-synchronous error lists | unknown | 2008-03-28 | 1 | -49/+30 |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build | unknown | 2008-02-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug#31929 Windows build fails with >=4 Parallel build threads. | unknown | 2008-01-29 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build | unknown | 2008-02-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> | unknown | 2008-02-18 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build | unknown | 2008-02-13 | 1 | -0/+8 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Make this build on Windows. | unknown | 2008-02-11 | 1 | -0/+8 |