summaryrefslogtreecommitdiff
path: root/strings
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-02-074-8/+12
|\
| * Fixed compiler warnings from gcc 7.4.1Monty2020-01-294-8/+12
| | | | | | | | - Fixed possible error in rocksdb/rdb_datadic.cc
* | MDEV-21581 Helper functions and methods for CHARSET_INFOAlexander Barkov2020-01-2812-89/+93
| |
* | Merge 10.4 into 10.5Marko Mäkelä2019-12-272-6/+14
|\ \ | |/
| * Merge 10.3 into 10.4Marko Mäkelä2019-12-272-6/+14
| |\
| | * Merge 10.2 into 10.3Marko Mäkelä2019-12-272-6/+14
| | |\
| | | * Merge 10.1 into 10.2Marko Mäkelä2019-12-232-6/+14
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.5' into 10.1Alexander Barkov2019-12-162-6/+14
| | | | |\
| | | | | * MDEV-21065 UNIQUE constraint causes a query with string comparison to omit a ↵Alexander Barkov2019-12-162-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | row in the result set
* | | | | | A cleanup for MDEV-8844: Fixing compilation failure on WindowsAlexander Barkov2019-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing lossy type conversions: - from int64 to int - from size_t to uint
* | | | | | MDEV-8844 Unreadable control characters printed as is in warningsAlexander Barkov2019-12-061-0/+94
| | | | | |
* | | | | | Merge 10.4 into 10.5Oleksandr Byelkin2019-11-071-4/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-11-011-4/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-311-4/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.1 into 10.2Marko Mäkelä2019-10-251-4/+14
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch 'github/5.5' into 10.1Sergei Golubchik2019-10-231-4/+14
| | | | |\ \ | | | | | |/
| | | | | * crash in string-to-int conversionSergei Golubchik2019-10-191-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using a specially crafted strings one could overflow `shift` variable and cause a crash by dereferencing d10[-2147483648] (on a sufficiently old gcc). This is a correct fix and a test case for Bug #29723340: MYSQL SERVER CRASH AFTER SQL QUERY WITH DATA ?AST
* | | | | | Merge remote-tracking branch 'origin/10.4' into 10.5Alexander Barkov2019-10-011-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2019-10-011-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-19628 JSON with starting double quotes key is not valid.Alexey Botchkov2019-09-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Make the skip_key a bit faster.
| | * | | | MDEV-19628 JSON with starting double quotes key is not valid.Alexey Botchkov2019-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First character of the key name is just skipped, so the escapement wasn't handled properly.
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-09-121-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-09-121-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-19670 json escaped unicode parse error.Alexey Botchkov2019-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixed 4-byte length characters handled incorrectly.
* | | | | | Fix clang-cl warningsVladislav Vaintroub2019-07-041-1/+1
| | | | | |
* | | | | | MDEV-19897 Rename source code variable names from utf8 to utf8mb3Alexander Barkov2019-06-287-477/+479
|/ / / / /
* | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-1937-38/+38
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-1437-38/+38
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-1337-38/+38
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1135-36/+36
| | | |\ \ | | | | |/
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-1134-35/+35
| | | | | | | | | | | | | | | | | | | | * Update wrong zip-code
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112-2/+2
| | | |\ \ | | | | |/
| | | | * Update FSF addressMichal Schorm2019-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
| | | * | Remove unused declarationsMarko Mäkelä2019-04-031-30/+1
| | | | |
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-04-021-4/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-291-3/+2
| |\ \ \ \ | | |/ / /
| | * | | post-merge: -Werror fixes in 10.2Sergei Golubchik2019-03-291-2/+2
| | | | |
* | | | | MDEV-5313 Improving audit API.Alexey Botchkov2019-01-181-2/+92
| | | | | | | | | | | | | | | | | | | | | | | | | json_locate_key() implemented. get rid of 'key_len' argument in functions.
* | | | | MDEV-5313 Improving audit plugin API.Alexey Botchkov2019-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Type conversion bug fixed.
* | | | | MDEV-5313 Improving audit api.Alexey Botchkov2019-01-171-49/+96
| | | | | | | | | | | | | | | | | | | | | | | | | JSON api implementations and tests pushed. sql_acl.cc fixed with the new function names.
* | | | | json helpersSergei Golubchik2018-12-121-0/+81
| | | | |
* | | | | MDEV-5313 Improving audit api.Alexey Botchkov2018-12-121-0/+32
| | | | | | | | | | | | | | | | | | | | Service added to handle json.
* | | | | Merge 10.3 into 10.4Marko Mäkelä2018-11-191-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-191-1/+1
| |\ \ \ \ | | |/ / /
| | * | | MDEV-17454 JSON_VALID( '{"a":1]' ) evaluates to 1.Alexey Botchkov2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Produce syntax error when '{...]'.
* | | | | Merge 10.3 into 10.4Marko Mäkelä2018-11-064-100/+101
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-064-100/+101
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
| | * | | Merge 10.1 into 10.2Marko Mäkelä2018-11-064-100/+101
| | |\ \ \ | | | |/ /
| | | * | Merge 10.0 into 10.1Marko Mäkelä2018-11-051-2/+2
| | | |\ \
| | | | * | MDEV-17298 ASAN unknown-crash / READ of size 1 in my_strntoul_8bit upon ↵Alexander Barkov2018-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | INSERT .. SELECT
View Lorry Controller Status