diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
commit | bc145193c164b895a52b943e73fff53952d48a60 (patch) | |
tree | 278a02f85834d7ed8fa6933959e9b3b96655d1e1 /sql/sql_string.h | |
parent | 1f1a61cfc41a01ffa65d568eebdc037a54b5c463 (diff) | |
parent | bfb0726fc24acb896e54bc7ef7536ad1aab9d574 (diff) | |
download | mariadb-git-bc145193c164b895a52b943e73fff53952d48a60.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 0065b1424ce..7a1701f6ef3 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -705,11 +705,6 @@ public: { length(0); } - StringBuffer(const char *str, size_t length_arg, CHARSET_INFO *cs) - : String(buff, buff_sz, cs) - { - set(str, length_arg, cs); - } }; |