summaryrefslogtreecommitdiff
path: root/strings
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | 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
* | | | 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.
* | | | MDEV-19670 json escaped unicode parse error.Alexey Botchkov2019-09-121-1/+3
| | | | | | | | | | | | | | | | Fixed 4-byte length characters handled incorrectly.
* | | | 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 branch '10.2' into 10.3Sergei Golubchik2019-03-291-3/+2
|\ \ \ \ | |/ / /
| * | | post-merge: -Werror fixes in 10.2Sergei Golubchik2019-03-291-2/+2
| | | |
* | | | 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.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
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-311-16/+19
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-311-16/+19
| | | |\ \ | | | | |/
| | | | * MDEV-17256 Decimal field multiplication bug.bb-5.5-hfAlexey Botchkov2018-10-301-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should clear trailing zeroes in frac part. Otherwise that tail is growing quickly and forces unnecessary truncating of arguments.
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-302-82/+80
| | |\ \ \ | | | |/ /
| | | * | MDEV-17064 LIKE function has error behavior on the fields in which the ↵Alexander Barkov2018-10-152-82/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collation is xxx_unicode_xx Synchronizing sources in: - my_wildcmp_uca_impl() handling utf8_unicode_ci - my_wildcmp_unicode_impl() handling utf8_general_ci The latter has already had a fix for a similar MySQL bug in utf8_general_ci: Bug#11754 SET NAMES utf8 followed by SELECT "A\\" LIKE "A\\" returns 0 So fix is now propagated to utf8_unicode_ci.
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-17001 JSON_MERGE returns nullwhen merging empty array.Alexey Botchkov2018-09-131-4/+0
| | | | | | | | | | | | | | | | | | | | Don't add the comma if nothing appended to the array.
| * | | | MDEV-17121 JSON_ARRAY_APPEND.Alexey Botchkov2018-09-111-0/+25
| | | | | | | | | | | | | | | | | | | | Extra comma added to the result when an json array is empty.
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-038-152/+90
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-027-152/+88
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-257-152/+88
| | |\ \ \ | | | |/ /
| | | * | Simplify caseup() and casedn() in charsetsAlexander Barkov2018-07-197-152/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the MDEV-13118 fix there's no code in the server that wants caseup/casedn to change the argument in place for simple charsets. Let's remove this logic and always return the result in a new string for all charsets, both simple and complex. 1. Removing the optimization that *some* character sets used in casedn() and caseup(), which allowed (and required) to change the case in-place, overwriting the string passed as the "src" argument. Now all CHARSET_INFO's work in the same way: non of them change the source string in-place, all of them now convert case from the source string to the destination string, leaving the source string untouched. 2. Adding "const" qualifier to the "char *src" parameter to caseup() and casedn(). 3. Removing duplicate implementations in ctype-mb.c. Now both caseup() and casedn() implementations for all CJK character sets use internally the same function my_casefold_mb() (the former my_casefold_mb_varlen()). 4. Removing the "unused" attribute from parameters of some my_case{up|dn}_xxx() implementations, as the affected parameters are now *used* in the code. Previously these parameters were used only in DBUG_ASSERT().
| * | | | MDEV-16054 simple json functions flatline cpu on garbage input.Alexey Botchkov2018-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | Incorrect char sentence should be handled properly.
| * | | | MDEV-15561 json_extract returns NULL with numbers in scientific notation.Alexey Botchkov2018-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | Scientific notation handling fixed.
* | | | | Add likely/unlikely to speed up executionMonty2018-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added to: - if (error) - Lex - sql_yacc.yy and sql_yacc_ora.yy - In header files to alloc() calls - Added thd argument to thd_net_is_killed()
* | | | | Misc. typosluz.paz2018-04-0519-25/+25
| | | | | | | | | | | | | | | | | | | | Found via `codespell -i 3 -w --skip="./debian/po" -I ../mariadb-server-word-whitelist.txt ./cmake/ ./debian/ ./Docs/ ./include/ ./man/ ./plugin/ ./strings/`
* | | | | MDEV-15561 json_extract returns NULL with numbers in scientific notation.Alexey Botchkov2018-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scientific notation handling fixed. Conflicts: mysql-test/r/func_json.result mysql-test/t/func_json.test
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-03-131-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-15420 Wrong result for CAST from TIME or DATETIME with zero integer ↵Alexander Barkov2018-02-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part and non-zero microseconds to DECIMAL(X,Y) The loop in ull2dec() does not iterate if "from" is zero, so to->intg got erroneously set to 0 instead of 1. Because if this, my_decimal2seconds() wrote the fractional part into a wrong buf[x]. Catching the special case with zero "from" and properly initialize "to" using decimal_make_zero().
* | | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -DWITH_ASAN can be used as well now, on x64 Fix many clang-cl warnings.
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ↵Vladislav Vaintroub2018-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'size_t' to 'type', possible loss of data) Handle string length as size_t, consistently (almost always:)) Change function prototypes to accept size_t, where in the past ulong or uint were used. change local/member variables to size_t when appropriate. This fix excludes rocksdb, spider,spider, sphinx and connect for now.
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2018-01-298-27/+27
|\ \ \ \ \ | |/ / / /
| * | | | Fix and reenable Windows compiler warning C4800 (size_t conversion).Vladislav Vaintroub2018-01-268-27/+27
| | | | |
* | | | | Minor spelling fixes in code comments, docs and outputOtto Kekäläinen2018-01-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This commit does not touch any variable names or any other actual code, and thus should not in any way affect how the code works.