diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
| commit | c32f71af7e4b747de223bf6b44e691941f5997cf (patch) | |
| tree | 03270b9a849e165f1c8605102ee06bced2331477 /sql/item_strfunc.cc | |
| parent | 4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff) | |
| parent | 555c6632c69d707cc1641ef396e7b66a65f14bdc (diff) | |
| download | mariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz | |
Merge branch '10.2' into 10.3
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 78857f377f5..0d519edc5b3 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -990,7 +990,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; @@ -1141,7 +1141,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. @@ -3997,7 +3997,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. |