Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2016-03-24 | 1 | -1/+43 |
|\ | |||||
| * | MDEV-9773: Memory corruption in mariadb_dyncol_unpack | Oleksandr Byelkin | 2016-03-24 | 1 | -1/+43 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 2 | -2/+77 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 2 | -2/+76 |
| |\ | |||||
| | * | compilation errors on sparc sun studio 10 | Sergei Golubchik | 2016-02-15 | 1 | -2/+2 |
| | * | MDEV-4664 mysql_upgrade crashes if root's password contains an apostrophe/sin... | Sergei Golubchik | 2016-02-06 | 1 | -5/+5 |
| | * | unit test for dynstr_append_os_quoted() | Sergei Golubchik | 2016-02-06 | 2 | -1/+75 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -1/+44 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 2 | -0/+72 |
| |\ \ | | |/ | |||||
| | * | unit tests for my_getopt | Sergei Golubchik | 2015-12-09 | 2 | -0/+72 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 | Sergei Golubchik | 2015-09-04 | 1 | -2/+5 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (autoset) | Oleksandr Byelkin | 2015-09-04 | 2 | -0/+354 |
* | | | New encryption API. Piece-wise encryption. | Sergei Golubchik | 2015-09-04 | 1 | -62/+41 |
* | | | my_crypt unittest | Sergei Golubchik | 2015-09-04 | 2 | -1/+123 |
* | | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 2 | -42/+0 |
* | | | lf_hash_iterate() function | Sergei Golubchik | 2014-12-28 | 1 | -5/+18 |
|/ / | |||||
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 2 | -178/+0 |
|\ \ | |/ | |||||
| * | fix broken -DWITHOUT_SERVER build: move sql-dependent unit test from mysys/ t... | Sergei Golubchik | 2014-05-05 | 2 | -176/+0 |
* | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 1 | -2/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -0/+1 |
|\ \ | |||||
* | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -5/+5 |
* | | | MDEV-5085: Dynamic columns require inclusion of my_sys.h and my_global.h | unknown | 2013-10-07 | 1 | -1/+0 |
* | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 1 | -0/+1 |
| * | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -1/+1 |
* | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 1 | -1/+1 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 2 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Bug #16994338 PARSING TAP OUTPUT OF UNIT TEST EXPLAIN_FILENAME-T FAILS | Annamalai Gurusami | 2013-06-26 | 1 | -1/+1 |
| | | * | Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8 | Tor Didriksen | 2013-06-14 | 1 | -1/+1 |
| | | * | BUG #13619394 - MAKE TEST FAILS ON MY_VSNPRINTF | sayantan dutta | 2013-06-03 | 1 | -5/+0 |
| | | * | BUG #16813006 - UNIT TEST FOR MY_VSNPRINTF FAIL FOR NON GNU COMPILER | sayantan dutta | 2013-05-16 | 1 | -0/+3 |
* | | | | MDEV-4993:Impossible to free a dynamic column | unknown | 2013-09-17 | 1 | -54/+54 |
* | | | | MDEV-4995: mariadb_dyncol_column_count returns error when passing an empty dy... | unknown | 2013-09-11 | 1 | -2/+14 |
* | | | | MDEV-4994: Crash in dynamic column API | unknown | 2013-09-11 | 2 | -75/+107 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 3 | -1/+237 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 3 | -1/+237 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 2 | -2/+175 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #16051728 SERVER CRASHES IN ADD_IDENTIFIER ON CONCURRENT ALTER TABLE AND | Annamalai Gurusami | 2013-03-21 | 2 | -1/+173 |
| | | * | Bug #13619394 - MAKE TEST FAILS ON MY_VSNPRINTF | unknown | 2013-02-22 | 1 | -1/+3 |
| | | * | BUG #13619394: fixing incorrect revert | Bjorn Munch | 2012-03-16 | 1 | -1/+1 |
| | | * | BUG #13619394 - 62572: "MAKE TEST" FAILS ON "MY_VSNPRINTF"Reverting Back sigh... | unknown | 2012-03-15 | 1 | -1/+1 |
| | | * | BUG #13619394: "MAKE TEST" FAILS ON "MY_VSNPRINTF" | unknown | 2012-03-14 | 1 | -1/+1 |
| | * | | unit test case for MDEV-4576 | Vladislav Vaintroub | 2013-06-17 | 2 | -0/+61 |
* | | | | correct truncation in my_vsnprintf %M format | Sergei Golubchik | 2012-10-25 | 1 | -57/+27 |
|/ / / | |||||
* | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmake | Sergei Golubchik | 2012-07-31 | 1 | -1/+1 |
* | | | Fixes after Serg's review of %M extenstions | Michael Widenius | 2012-06-17 | 1 | -2/+2 |
* | | | Fixed some compiler warnings and test failures found by buildbot | Michael Widenius | 2012-06-13 | 1 | -1/+1 |