diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 20:37:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 20:37:52 +0300 |
| commit | 101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a (patch) | |
| tree | 11747103367332f63928220376b5093b9e2ebdc5 /sql/item_strfunc.cc | |
| parent | 2b9c53102c7c7428279c5fd02f771d335b5c53dc (diff) | |
| parent | ddffcad64c9ff3299037eed9df1bc92d51f8d07e (diff) | |
| download | mariadb-git-101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a.tar.gz | |
Merge mariadb-10.4.14
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 5ae6fe0c7de..a61de0dfdaf 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -989,7 +989,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; @@ -1139,7 +1139,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. @@ -4023,7 +4023,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. |