Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 3 | -9/+4 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 2 | -8/+3 |
| |\ | |||||
| | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 2 | -8/+3 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 2 | -8/+3 |
| | | |\ | |||||
| | | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 2 | -11/+19 |
| * | | | | MDEV-12312 JSON_CONTAINS_PATH does not detect invalid path and returns | Alexey Botchkov | 2017-10-06 | 1 | -1/+1 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 5 | -15/+15 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 5 | -15/+15 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-21 | 1 | -4/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -4/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -4/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Build improvements and cleanups. | Vladislav Vaintroub | 2017-09-08 | 1 | -4/+0 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-18 | 1 | -4/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Make compiler happy with the 'fall through' comments. | Alexey Botchkov | 2017-09-14 | 1 | -3/+4 |
| * | | | | Compiler warning avoided. | Alexey Botchkov | 2017-09-14 | 1 | -1/+1 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-14 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-13138 JSON_OBJECT returns null with strings containing backticks. | Alexey Botchkov | 2017-09-12 | 1 | -1/+1 |
* | | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 2 | -2/+3 |
* | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | MDEV-12604 Comparison of JSON_EXTRACT result differs with Mysql. | Alexey Botchkov | 2017-08-08 | 1 | -1/+1 |
* | | | | MDEV-12324 Wrong result (phantom array value) on JSON_EXTRACT. | Alexey Botchkov | 2017-08-07 | 1 | -1/+1 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-6262 analyze the coverity report on mariadb | Sergei Golubchik | 2017-05-19 | 1 | -1/+1 |
| | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 2 | -4/+14 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 2 | -4/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 2 | -4/+14 |
* | | | | MDEV-12351 Assertion `cur_step->type & JSON_PATH_KEY' failed in | Alexey Botchkov | 2017-05-02 | 1 | -0/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 3 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Correct FSF address | iangilfillan | 2017-03-10 | 2 | -2/+2 |
| * | | | MDEV-11752 Unsafe strmov - function definition in include/m_string.h | Sergei Golubchik | 2017-03-10 | 1 | -0/+1 |
* | | | | MDEV-11856 json_search doesn't search for values with double quotes | Alexey Botchkov | 2017-03-14 | 1 | -0/+2 |
* | | | | Fix several compile warnings on Windows | Vladislav Vaintroub | 2017-03-10 | 2 | -3/+1 |
* | | | | MDEV-11858 json_merge() concatenates instead of merging. | Alexey Botchkov | 2017-02-10 | 1 | -7/+0 |
* | | | | MDEV-11857 json_search() shows "Out of memory" with empty key. | Alexey Botchkov | 2017-02-09 | 1 | -1/+3 |
* | | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB. | Alexey Botchkov | 2017-02-06 | 1 | -24/+86 |
* | | | | MDEV-11938 json.json_no_table crashes or fails with valgrind warnings in json... | Alexey Botchkov | 2017-02-02 | 1 | -30/+54 |
* | | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB. | Alexey Botchkov | 2017-01-26 | 1 | -6/+37 |
* | | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB. | Alexey Botchkov | 2017-01-24 | 1 | -26/+140 |
* | | | | MDEV-11042 Implement GeoJSON functions. | Alexey Botchkov | 2017-01-24 | 1 | -4/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | str2decimal: don't return a negative zero | Sergei Golubchik | 2016-12-05 | 1 | -0/+2 |
| * | | | Removing the unused function my_bincmp() from strings/ctype-ucs2.c | Alexander Barkov | 2016-11-24 | 1 | -11/+0 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 2 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 2 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | potential signedness issue | Sergei Golubchik | 2016-09-12 | 2 | -11/+11 |
| | | * | MDEV-7973 bigint fail with gcc 5.0 | Sergei Golubchik | 2016-07-06 | 1 | -0/+4 |
* | | | | MDEV-11571 JSON_EXTRACT returns wrong results. | Alexey Botchkov | 2016-12-24 | 1 | -4/+1 |