Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -8/+9 |
|\ | |||||
| * | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -77/+294 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2012-02-20 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fixed compiler warnings | Michael Widenius | 2012-02-20 | 1 | -1/+1 |
| | * | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -77/+294 |
| | |\ \ | | | |/ | |||||
| | | * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -77/+294 |
| | | |\ | |||||
| | | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-11-30 | 1 | -65/+276 |
| * | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-106 my_gethwaddr() does not compile on Solaris 11 | Sergei Golubchik | 2012-01-23 | 1 | -3/+3 |
* | | | | | fix the include guards and add missing gplv2 headers | Sergei Golubchik | 2012-02-17 | 2 | -0/+17 |
* | | | | | Cherry-picked fix for solaris compilation from 5.2 | Vladislav Vaintroub | 2012-02-02 | 1 | -3/+3 |
* | | | | | portability fixes for FreeBSD 8 and 9 | Vladislav Vaintroub | 2012-01-23 | 1 | -2/+4 |
* | | | | | - Always compile my_new.cc and safemalloc.c with mysys | Vladislav Vaintroub | 2012-01-20 | 2 | -10/+7 |
* | | | | | Fix embedded build on Windows. | Vladislav Vaintroub | 2012-01-20 | 1 | -1/+1 |
* | | | | | - Fix rpl_checksum test. Use basename of file in error messages, not the o | Vladislav Vaintroub | 2012-01-20 | 3 | -13/+56 |
* | | | | | MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VAR | Sergei Golubchik | 2012-01-17 | 1 | -31/+43 |
* | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -61/+274 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-12-02 | 1 | -61/+273 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 27 | -28/+58 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 50 | -105/+230 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 50 | -108/+235 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 50 | -105/+230 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -11/+10 |
| | | | |\ \ | |||||
| | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 7 | -798/+260 |
| | | | |\ \ \ | |||||
| | | * | | | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -3/+2 |
| * | | | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter Knauf | Michael Widenius | 2011-12-02 | 2 | -2/+7 |
* | | | | | | | | moved ha_maria::implicit_commit() calls around | Sergei Golubchik | 2012-01-06 | 1 | -2/+2 |
* | | | | | | | | fixes for opensolaris compilation failures | Sergei Golubchik | 2012-01-05 | 1 | -1/+1 |
* | | | | | | | | Fix compile error | Vladislav Vaintroub | 2011-12-27 | 1 | -1/+1 |
* | | | | | | | | Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous i... | Michael Widenius | 2011-12-27 | 2 | -4/+4 |
* | | | | | | | | * remove WITH_DEBUG from CMakeLists.txt | Sergei Golubchik | 2011-12-15 | 1 | -17/+5 |
* | | | | | | | | rename debug variable to debug_dbug, to make test pass in release builds | Sergei Golubchik | 2011-12-15 | 1 | -1/+1 |
* | | | | | | | | new configure option: NOT_FOR_DISTRIBUTION | Sergei Golubchik | 2011-12-14 | 2 | -1/+2 |
* | | | | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 6 | -13/+377 |
* | | | | | | | | another backtrace resolver that prints source file name and line number | Sergei Golubchik | 2011-12-11 | 3 | -5/+168 |
* | | | | | | | | win64 sysvar portability fixes | Sergei Golubchik | 2011-12-02 | 1 | -1/+1 |
* | | | | | | | | Fixed crashes found by application verifier: | Vladislav Vaintroub | 2011-12-02 | 2 | -17/+20 |
* | | | | | | | | small cleanup | Sergei Golubchik | 2011-11-28 | 1 | -3/+0 |
* | | | | | | | | merged | Sergei Golubchik | 2011-11-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix linking on Windows (iphlpapi missing) | Vladislav Vaintroub | 2011-11-23 | 1 | -1/+2 |
* | | | | | | | | | compilation fixes | Sergei Golubchik | 2011-11-27 | 1 | -2/+4 |
* | | | | | | | | | compiler warnings/errors | Sergei Golubchik | 2011-11-23 | 1 | -0/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 13 | -204/+287 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix bug lp:869036 | unknown | 2011-11-17 | 1 | -0/+90 |
| * | | | | | | | merge 5.2 | Vladislav Vaintroub | 2011-10-19 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge from 5.1 | Vladislav Vaintroub | 2011-10-19 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | |||||
| | | * | | | | | Fix endless loop in my_gethwaddr() | Vladislav Vaintroub | 2011-10-19 | 1 | -0/+3 |
| | * | | | | | | Fixed wrong info message for mysqld --general-log | Michael Widenius | 2011-10-16 | 1 | -2/+4 |
| * | | | | | | | Fix of building on Mac OS. | unknown | 2011-10-18 | 1 | -3/+2 |
| * | | | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -5/+4 |