diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
| commit | 48b5777ebda9bf14c60ad05298dac67933e9799f (patch) | |
| tree | 2c023b5cc7811faea8a9b4ad82998e4624c29068 /sql/item_strfunc.cc | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| parent | 9a156e1a23046ba3e37bdb1e4e1ad887d3f5829b (diff) | |
| download | mariadb-git-48b5777ebda9bf14c60ad05298dac67933e9799f.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 7f853a73c71..176a6e6efc9 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -984,7 +984,7 @@ String *Item_func_concat_ws::val_str(String *str) goto null; // Must be a blob } else if (res2 == &tmp_value) - { // This can happend only 1 time + { // This can happen only 1 time if (tmp_value.replace(0,0,*sep_str) || tmp_value.replace(0,0,*res)) goto null; res= &tmp_value; @@ -1134,7 +1134,7 @@ bool Item_func_reverse::fix_length_and_dec() } /** - Replace all occurences of string2 in string1 with string3. + Replace all occurrences of string2 in string1 with string3. Don't reallocate val_str() if not needed. @@ -3979,7 +3979,7 @@ bool Item_func_export_set::fix_length_and_dec() using in a SQL statement. Adds a \\ before all characters that needs to be escaped in a SQL string. - We also escape '^Z' (END-OF-FILE in windows) to avoid probelms when + We also escape '^Z' (END-OF-FILE in windows) to avoid problems when running commands from a file in windows. This function is very useful when you want to generate SQL statements. |