summaryrefslogtreecommitdiff
path: root/strings
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-303-9/+4
|\ | | | | | | TODO: enable MDEV-13049 optimization for 10.3
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-10-242-8/+3
| |\
| | * Merge branch '10.0' into 10.1Sergei Golubchik2017-10-222-8/+3
| | |\
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-182-8/+3
| | | |\
| | | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-172-11/+19
| | | | | | | | | | | | | | | | | | | | mostly caused by -Wimplicit-fallthrough
| * | | | MDEV-12312 JSON_CONTAINS_PATH does not detect invalid path and returnsAlexey Botchkov2017-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TRUE. Let's make empty brackets to be the syntax error in the JSON paths.
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-045-15/+15
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-285-15/+15
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-211-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-191-4/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-4/+0
| | |\ \ \ | | | |/ /
| | | * | Build improvements and cleanups.Vladislav Vaintroub2017-09-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - the probably ultimate fix for dependencies on VS - remove some GET_TARGET_PROPERTY(LOCATION ...), they are deprecated in cmake 3.9 - simplify signing targets on Windows. - remove INSTALL_DEBUG_TARGET, we do not mix binaries from different builds in the same package
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-181-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | Make compiler happy with the 'fall through' comments.Alexey Botchkov2017-09-141-3/+4
| | | | |
| * | | | Compiler warning avoided.Alexey Botchkov2017-09-141-1/+1
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-13138 JSON_OBJECT returns null with strings containing backticks.Alexey Botchkov2017-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | Condition was fixed.
* | | | | Added DBUG_ASSERT_AS_PRINTF compile flagMonty2017-08-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If compiling a non DBUG binary with -DDBUG_ASSERT_AS_PRINTF asserts will be changed to printf + stack trace (of stack trace are enabled). - Changed #ifndef DBUG_OFF to #ifdef DBUG_ASSERT_EXISTS for those DBUG_OFF that was just used to enable assert - Assert checking that could greatly impact performance where changed to DBUG_ASSERT_SLOW which is not affected by DBUG_ASSERT_AS_PRINTF - Added one extra option to my_print_stacktrace() to get more silent in case of stack trace printing as part of assert.
* | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added sql/mariadb.h file that should be included first by files in sql directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables that must be done before my_global.h is included) - Removed a lot of include my_global.h from include files - Removed include's of some files that my_global.h automatically includes - Removed duplicated include's of my_sys.h - Replaced include my_config.h with my_global.h
* | | | MDEV-12604 Comparison of JSON_EXTRACT result differs with Mysql.Alexey Botchkov2017-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | Comparison fixed to take the actual type of JSON value into account. Bug in escaping handling fixed.
* | | | MDEV-12324 Wrong result (phantom array value) on JSON_EXTRACT.Alexey Botchkov2017-08-071-1/+1
| | | | | | | | | | | | | | | | Fixed the path comparison.
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-231-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | uploaded 10.0, analyzed everything with the Impact=High (and a couple of Medium)
| | * | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-172-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not silence uncertain cases, or fix any bugs. The only functional change should be that ha_federated::extra() is not calling DBUG_PRINT to report an unhandled case for HA_EXTRA_PREPARE_FOR_DROP.
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-222-4/+14
|\ \ \ \ | |/ / /
| * | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-172-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not silence uncertain cases, or fix any bugs. The only functional change should be that ha_federated::extra() is not calling DBUG_PRINT to report an unhandled case for HA_EXTRA_PREPARE_FOR_DROP.
* | | | MDEV-12351 Assertion `cur_step->type & JSON_PATH_KEY' failed inAlexey Botchkov2017-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | json_find_path. The ..[0] path can be treated wrong on second json_find_path call.
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-303-2/+3
|\ \ \ \ | |/ / /
| * | | Correct FSF addressiangilfillan2017-03-102-2/+2
| | | |
| * | | MDEV-11752 Unsafe strmov - function definition in include/m_string.hSergei Golubchik2017-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | assert that strmov() cannot be used on overlapping strings. (because strpcpy cannot)
* | | | MDEV-11856 json_search doesn't search for values with double quotesAlexey Botchkov2017-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | character ("). The my_wildcmp function doesn't expect the string parameter to have escapements, only the template. So the string should be unescaped if necessary.
* | | | Fix several compile warnings on WindowsVladislav Vaintroub2017-03-102-3/+1
| | | |
* | | | MDEV-11858 json_merge() concatenates instead of merging.Alexey Botchkov2017-02-101-7/+0
| | | | | | | | | | | | | | | | Fix json_merge implementation.
* | | | MDEV-11857 json_search() shows "Out of memory" with empty key.Alexey Botchkov2017-02-091-1/+3
| | | | | | | | | | | | | | | | We should be ready for an empty key.
* | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-02-061-24/+86
| | | | | | | | | | | | | | | | Fixes for issues found.
* | | | MDEV-11938 json.json_no_table crashes or fails with valgrind warnings in ↵Alexey Botchkov2017-02-021-30/+54
| | | | | | | | | | | | | | | | | | | | | | | | json_find_path / Item_func_json_length::val_int. Paths with quoted keynames handled improperly.
* | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-01-261-6/+37
| | | | | | | | | | | | | | | | paths ending on [0]..[0] should be handled in conforming manner.
* | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-01-241-26/+140
| | | | | | | | | | | | | | | | json_no_table.test ported.
* | | | MDEV-11042 Implement GeoJSON functions.Alexey Botchkov2017-01-241-4/+1
| | | | | | | | | | | | | | | | ST_AsGeoJSON and ST_GeomFromGeoJSON functions implemented.
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-292-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-0/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-0/+2
| | |\ \ | | | |/
| | | * str2decimal: don't return a negative zeroSergei Golubchik2016-12-051-0/+2
| | | |
| * | | Removing the unused function my_bincmp() from strings/ctype-ucs2.cAlexander Barkov2016-11-241-11/+0
| | | |
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-282-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-272-2/+2
| | |\ \ | | | |/
| | | * potential signedness issueSergei Golubchik2016-09-122-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | different fix for 07a33cdcef: Bug #23296299 : HANDLE_FATAL_SIGNAL (SIG=11) IN MY_TOSORT_UTF32
| | | * MDEV-7973 bigint fail with gcc 5.0Sergei Golubchik2016-07-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -LONGLONG_MIN is the undefined behavior in C. longlong2decimal() used to do this: int longlong2decimal(longlong from, decimal_t *to) { if ((to->sign= from < 0)) return ull2dec(-from, to); return ull2dec(from, to); and later in ull2dec() (DIG_BASE is 1000000000): static int ull2dec(ulonglong from, decimal_t *to) { for (intg1=1; from >= DIG_BASE; intg1++, from/=DIG_BASE) {} this breaks in gcc-5 at -O3. Here ull2dec is inlined into longlong2decimal. And gcc-5 believes that 'from' in the inlined ull2dec is always a positive integer (indeed, if it was negative, then -from was used instead). So gcc-5 uses *signed* comparison with DIG_BASE. Fix: make a special case for LONGLONG_MIN, don't negate it
* | | | MDEV-11571 JSON_EXTRACT returns wrong results.Alexey Botchkov2016-12-241-4/+1
| | | | | | | | | | | | | | | | Array counter didn't increment after an item was found.